Expand user group views and translations

resources/assets/v2/api/v2/model/user-group/get.js

@@ -23,15 +23,15 @@ import format from "date-fns/format";
 
 export default class Get {
 
-    // /**
-    //  *
-    //  * @param identifier
-    //  * @param params
-    //  * @returns {Promise<AxiosResponse<any>>}
-    //  */
-    // show(identifier, params) {
-    //     return api.get('/api/v2/accounts/' + identifier, {params: params});
-    // }
+    /**
+     *
+     * @param identifier
+     * @param params
+     * @returns {Promise<AxiosResponse<any>>}
+     */
+    show(identifier, params) {
+        return api.get('/api/v2/user-groups/' + identifier, {params: params});
+    }
 
     /**
      *

resources/assets/v2/api/v2/model/user-group/post.js

@@ -25,4 +25,9 @@ export default class Post {
         let url = './api/v2/user-groups';
         return api.post(url, submission);
     }
+
+    use(groupId) {
+        let url = './api/v2/user-groups/' + groupId  + '/use';
+        return api.post(url, {});
+    }
 }

resources/assets/v2/api/v2/model/user-group/put.js

@@ -0,0 +1,28 @@
+/*
+ * post.js
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {api} from "../../../../boot/axios";
+
+export default class Put {
+    put(submission, params) {
+        let url = '/api/v2/user-groups/' + parseInt(params.id);
+        return api.put(url, submission);
+    }
+}

resources/assets/v2/pages/administrations/create.js

@@ -60,6 +60,7 @@ let administrations = function () {
 
         pageProperties: {},
         submitForm() {
+            this.errors.title = [];
             (new Post()).post({title: this.title}).then(response => {
                 if (this.formStates.returnHereButton) {
                     this.notifications.success.show = true;
@@ -73,7 +74,7 @@ let administrations = function () {
                     window.location.href = './administrations?user_group_id=' + parseInt(response.data.data.id) + '&message=created';
                 }
             }).catch(error => {
-                console.error(error);
+                this.errors.title = error.response.data.errors.title;
             });
 
         },

resources/assets/v2/pages/administrations/edit.js

@@ -0,0 +1,121 @@
+/*
+ * template.js
+ * Copyright (c) 2024 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+import '../../boot/bootstrap.js';
+import dates from "../shared/dates.js";
+import Post from "../../api/v2/model/user-group/post.js";
+import i18next from "i18next";
+import Get from "../../api/v2/model/user-group/get.js";
+import Put from "../../api/v2/model/user-group/put.js";
+
+
+let administrations = function () {
+    return {
+        title: '',
+        id: 0,
+        errors: {
+            title: []
+        },
+
+        // notifications
+        notifications: {
+            error: {
+                show: false, text: '', url: '',
+            }, success: {
+                show: false, text: '', url: '',
+            }, wait: {
+                show: false, text: '',
+
+            }
+        },
+        // state of the form is stored in formState:
+        formStates: {
+            isSubmitting: false,
+            returnHereButton: false,
+            saveAsNewButton: false, // edit form only
+            resetButton: false,
+        },
+
+        // form behaviour
+        formBehaviour: {
+            formType: 'update', // or 'update'
+        },
+        changedTitle() {
+
+        },
+
+        pageProperties: {},
+        submitForm() {
+            console.log('submitForm');
+            (new Put()).put({title: this.title}, {id: this.id}).then(response => {
+                if (this.formStates.returnHereButton) {
+                    this.notifications.success.show = true;
+                    this.notifications.success.text = i18next.t('firefly.updated_administration', {title: response.data.data.attributes.title});
+                    // TODO needs a better redirect.
+                    this.notifications.success.url = './administrations';
+                }
+                if (this.formStates.resetButton) {
+                    this.title = '';
+                }
+                if (!this.formStates.returnHereButton) {
+                    // TODO needs a better redirect.
+                    window.location.href = './administrations?user_group_id=' + parseInt(response.data.data.id) + '&message=updated';
+                }
+            }).catch(error => {
+                this.errors.title = error.response.data.errors.title;
+            });
+
+        },
+        cancelForm() {
+            window.location.href = './administrations';
+        },
+        init() {
+            const page = window.location.href.split('/');
+            const groupId = parseInt(page[page.length - 1]);
+            (new Get()).show(groupId, {}).then(response => {
+                this.title = response.data.data.attributes.title;
+                this.id = parseInt(response.data.data.id);
+            });
+        }
+    }
+}
+
+
+let comps = {administrations, dates};
+
+function loadPage() {
+    Object.keys(comps).forEach(comp => {
+        console.log(`Loading page component "${comp}"`);
+        let data = comps[comp]();
+        Alpine.data(comp, () => data);
+    });
+    Alpine.start();
+}
+
+// wait for load until bootstrapped event is received.
+document.addEventListener('firefly-iii-bootstrapped', () => {
+    console.log('Loaded through event listener.');
+    loadPage();
+});
+// or is bootstrapped before event is triggered.
+if (window.bootstrapped) {
+    console.log('Loaded through window variable.');
+    loadPage();
+}

resources/assets/v2/pages/administrations/index.js

@@ -27,6 +27,7 @@ import '@ag-grid-community/styles/ag-grid.css';
 import '@ag-grid-community/styles/ag-theme-alpine.css';
 import '../../css/grid-ff3-theme.css';
 import Get from "../../api/v2/model/user-group/get.js";
+import Post from "../../api/v2/model/user-group/post.js";
 
 let index = function () {
     return {
@@ -53,6 +54,13 @@ let index = function () {
             this.notifications.wait.text = i18next.t('firefly.wait_loading_data')
             this.loadAdministrations();
         },
+        useAdministration(id) {
+            let groupId = parseInt(id);
+            // try to post "use", then reload administrations.
+            (new Post()).use(groupId).then(response => {
+               this.loadAdministrations();
+            });
+        },
 
         loadAdministrations() {
             this.notifications.wait.show = true;
@@ -73,16 +81,13 @@ let index = function () {
                             membersVisible: current.attributes.can_see_members,
                             members: [],
                         };
-                        console.log('Processing group #' + group.id + ' (' + group.title + ')' );
                         let memberships = {};
                         for (let j = 0; j < current.attributes.members.length; j++) {
                             let member = current.attributes.members[j];
-                            console.log('Found member ' + member.user_email, member.you, member.role);
                             if ('owner' === member.role) {
                                 group.owner = i18next.t('firefly.administration_owner', {email: member.user_email});
                             }
                             if (true === member.you && 'owner' === member.role) {
-                                console.log('You are owner of group ' + group.title );
                                 group.isOwner = true;
                             }
                             if (true === member.you) {

resources/lang/en_US/firefly.php

@@ -1391,8 +1391,11 @@ return [
     'administration_you'                                  => 'Your role: {{role}}',
     'other_users_in_admin'                                => 'Other users in this administration',
     'administrations_create_breadcrumb'                   => 'Create new financial administration',
+    'administrations_page_create_sub_title'                => 'Create new financial administration',
     'basic_administration_information'                    => 'Basic administration information',
     'new_administration_created'                          => 'New financial administration "{{title}}" has been created',
+    'edit_administration_breadcrumb' => 'Edit financial administration ":title"',
+    'administrations_page_edit_sub_title'=> 'Edit financial administration ":title"',
 
     // roles
     'administration_role_owner'                           => 'Owner',

resources/lang/en_US/validation.php

@@ -264,6 +264,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'You do not have the correct access rights for this administration.',
+    'administration_owner_rename' => 'You can\'t rename your standard administration.',
 ];
 
 // Ignore this comment

resources/views/v2/administrations/edit.blade.php

@@ -0,0 +1,57 @@
+@extends('layout.v2')
+@section('scripts')
+    @vite(['resources/assets/v2/pages/administrations/edit.js'])
+@endsection
+@section('content')
+    <div class="app-content">
+        <!--begin::Container-->
+        <div class="container-fluid" x-data="administrations" id="form">
+            <x-messages></x-messages>
+            <div class="row mb-3">
+                <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">
+                    <div class="card">
+                        <div class="card-header">
+                            <h3 class="card-title"
+                            >{{ __('firefly.basic_administration_information') }}</h3>
+                        </div>
+                        <div class="card-body">
+                            <!-- TITLE -->
+                            @include('partials.form.title')
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row mb-3">
+                <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">
+                    <div class="card">
+                        <div class="card-header">
+                            <h3 class="card-title">
+                                {{ __('firefly.submission_options') }}
+                            </h3>
+                        </div>
+                        <div class="card-body">
+                            @include('partials.form.submission-options')
+                        </div>
+                        <div class="card-footer">
+                            <div class="row">
+                                <div class="col text-end">
+                                    <div class="btn-group">
+                                        <button @click="cancelForm()" class="btn btn-danger text-white"
+                                                :disabled="formStates.isSubmitting">
+                                            <em class="fa-solid fa-arrow-left"></em>
+                                            {{ __('firefly.cancel')  }}</button>
+                                        <button class="btn btn-primary text-white" :disabled="formStates.isSubmitting"
+                                                @click="submitForm()">
+                                            <em class="fa-regular fa-circle-check"></em>
+                                            {{ __('firefly.submit') }}</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+@endsection

resources/views/v2/administrations/index.blade.php

@@ -19,7 +19,11 @@
                     <div class="col-xl-4 col-lg-4 col-sm-6 col-xs-12 mb-3">
                         <div class="card">
                             <div class="card-header">
-                                <h3 class="card-title">Administration "<span x-text="group.title"></span>"</h3>
+                                <h3 class="card-title">
+                                    <template x-if="group.in_use">
+                                        <em class="fa-regular fa-square-check"></em>
+                                    </template>
+                                    Administration "<span x-text="group.title"></span>"</h3>
                             </div>
                             <div class="card-body">
                                 <ul>
@@ -53,13 +57,13 @@
                             <div class="card-footer">
                                 <div class="btn-group">
                                     <template x-if="false === group.in_use">
-                                    <a href="#" class="btn btn-primary">
+                                    <button @click="useAdministration(group.id)" class="btn btn-primary">
                                         <em class="fa-solid fa-coins"></em> Use
-                                    </a>
+                                    </button>
                                     </template>
                                     <template x-if="true === group.isOwner">
-                                    <a href="#" class="btn btn-primary">
-                                        <em class="fa-solid fa-pencil"></em> Edit
+                                    <a :href="'{{route('administrations.edit', [''])}}/' + group.id" class="btn btn-primary">
+                                        <em class="fa-solid fa-pencil"></em> {{ __('firefly.edit') }}
                                     </a>
                                     </template>
                                     <template x-if="true === group.isOwner">