From ad5bc593393419b7149a01892a923e4ea0cdbe6f Mon Sep 17 00:00:00 2001 From: "Petter H. Juliussen" Date: Mon, 11 Sep 2023 11:26:52 +0200 Subject: [PATCH 01/25] Prevent item filter input from disappearing --- CHANGELOG.md | 2 ++ src/views/Admin/components/AdminItems.vue | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1330eeb0c..1f802371c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file. The format ### Fixed - Fixed create/edit/delete rights for organization admins. +- Organization, department and product filter in admin panel should no longer + disappear when search result count reaches certain threshold. ### Changed diff --git a/src/views/Admin/components/AdminItems.vue b/src/views/Admin/components/AdminItems.vue index 9cdaf0c2c..4663c0791 100644 --- a/src/views/Admin/components/AdminItems.vue +++ b/src/views/Admin/components/AdminItems.vue @@ -4,7 +4,7 @@

{{ $t('general.organizations') }}

-
+

{{ $t('general.departments') }}

-
+

{{ $t('general.products') }}

-
+
Date: Mon, 11 Sep 2023 12:40:38 +0200 Subject: [PATCH 02/25] Link directly to item edit from the admin panel --- CHANGELOG.md | 2 ++ src/views/Admin/components/AdminItems.vue | 25 ++++++++++++----------- src/views/Item/ItemAbout.vue | 9 ++++++++ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f802371c..501e62c20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ All notable changes to this project will be documented in this file. The format - Made links clickable in the description of objects, key results and goals. - It is no longer possible to close open modals or drawers by clicking outside them. This is meant to prevent accidental data loss in unsaved forms. +- Items in the admin panel now links directly to each respective item about page + with the edit drawer opened. ## [3.9.0] 2023-09-01 diff --git a/src/views/Admin/components/AdminItems.vue b/src/views/Admin/components/AdminItems.vue index 4663c0791..c205917cf 100644 --- a/src/views/Admin/components/AdminItems.vue +++ b/src/views/Admin/components/AdminItems.vue @@ -20,10 +20,7 @@ :key="organization.id" class="col__row" > - + {{ organization.name }} @@ -56,10 +53,7 @@
- + {{ department.name }} @@ -91,10 +85,7 @@
- + {{ product.name }} @@ -246,6 +237,16 @@ export default { } }, }, + + methods: { + itemLink(slug) { + return { + name: 'ItemAbout', + params: { slug }, + query: { edit: true }, + }; + }, + }, }; diff --git a/src/views/Item/ItemAbout.vue b/src/views/Item/ItemAbout.vue index 14d8f3575..a898a4caf 100644 --- a/src/views/Item/ItemAbout.vue +++ b/src/views/Item/ItemAbout.vue @@ -49,6 +49,7 @@ :visible="hasEditRights && showItemDrawer" :item="activeItem" @close="showItemDrawer = false" + @hook:mounted="showItemDrawer = String($route.query.edit).toLowerCase() === 'true'" /> Date: Thu, 31 Aug 2023 13:55:57 +0200 Subject: [PATCH 03/25] Add objective contributors create/remove functions Add create and remove functions for the new objective contributors collection. --- firestore.rules | 30 ++++++++++++++- .../ObjectiveContributors.js | 37 +++++++++++++++++++ src/db/ObjectiveContributors/index.js | 3 ++ src/db/ObjectiveContributors/props.js | 10 +++++ 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 src/db/ObjectiveContributors/ObjectiveContributors.js create mode 100644 src/db/ObjectiveContributors/index.js create mode 100644 src/db/ObjectiveContributors/props.js diff --git a/firestore.rules b/firestore.rules index 5c4587c20..7e037254e 100644 --- a/firestore.rules +++ b/firestore.rules @@ -89,6 +89,32 @@ service cloud.firestore { return userIsMemberOfParent; } + /** + * Return true if the current user is a member of the parent of the + * document's objective *before* performing the action. + */ + function isMemberOfObjectiveParentBefore(document, type) { + let userRef = /databases/$(database)/documents/users/$(request.auth.token.email); + let doc = get(/databases/$(database)/documents/$(type)/$(document)); + let objectiveDoc = get(doc.data.objective); + let parentDoc = get(objectiveDoc.data.parent); + let userIsMemberOfParent = userRef in parentDoc.data.team; + return userIsMemberOfParent; + } + + /** + * Return true if the current user is a member of the parent of the + * document's objective *after* performing the action. + */ + function isMemberOfObjectiveParentAfter(document, type) { + let userRef = /databases/$(database)/documents/users/$(request.auth.token.email); + let doc = getAfter(/databases/$(database)/documents/$(type)/$(document)); + let objectiveDoc = getAfter(doc.data.objective); + let parentDoc = getAfter(objectiveDoc.data.parent); + let userIsMemberOfParent = userRef in parentDoc.data.team; + return userIsMemberOfParent; + } + function isSelf(document) { let user = document == request.auth.token.email; return user; @@ -159,10 +185,12 @@ service cloud.firestore { } /* - * TODO: Needs to be extended with rules for `create` and `delete`. + * TODO: Should also allow create/delete by organization admins. */ match /objectiveContributors/{document} { allow read: if isSignedIn(); + allow create: if isSuperAdmin() || isMemberOfObjectiveParentAfter(document, 'objectiveContributors'); + allow delete: if isSuperAdmin() || isMemberOfObjectiveParentBefore(document, 'objectiveContributors'); } match /periods/{document} { diff --git a/src/db/ObjectiveContributors/ObjectiveContributors.js b/src/db/ObjectiveContributors/ObjectiveContributors.js new file mode 100644 index 000000000..6fcd4bb62 --- /dev/null +++ b/src/db/ObjectiveContributors/ObjectiveContributors.js @@ -0,0 +1,37 @@ +import { db } from '@/config/firebaseConfig'; +import props from './props'; +import { createDocument, validateCreateProps } from '../common'; + +const collection = db.collection('objectiveContributors'); + +const create = async (itemRef, objectiveRef) => { + if (await itemRef.get().then(({ exists }) => !exists)) { + throw new Error(`Cannot find item with ID ${itemRef.id}`); + } + if (await objectiveRef.get().then(({ exists }) => !exists)) { + throw new Error(`Cannot find objcetive with ID ${objectiveRef.id}`); + } + + const data = { item: itemRef, objective: objectiveRef }; + + validateCreateProps(props, data); + + return createDocument(collection, data); +}; + +const remove = async (itemRef, objectiveRef) => { + collection + .where('item', '==', itemRef) + .where('objective', '==', objectiveRef) + .get() + .then((snapshot) => { + if (snapshot.docs.length < 1) { + throw new Error( + `ObjectiveContributors for item ${itemRef.id} and objective ${objectiveRef.id} not found; cannot delete` + ); + } + snapshot.forEach((doc) => doc.ref.delete()); + }); +}; + +export default { create, remove }; diff --git a/src/db/ObjectiveContributors/index.js b/src/db/ObjectiveContributors/index.js new file mode 100644 index 000000000..797ff38f0 --- /dev/null +++ b/src/db/ObjectiveContributors/index.js @@ -0,0 +1,3 @@ +import ObjectiveContributors from './ObjectiveContributors'; + +export default ObjectiveContributors; diff --git a/src/db/ObjectiveContributors/props.js b/src/db/ObjectiveContributors/props.js new file mode 100644 index 000000000..6e7a0f7b7 --- /dev/null +++ b/src/db/ObjectiveContributors/props.js @@ -0,0 +1,10 @@ +export default { + item: { + type: 'reference', + required: true, + }, + objective: { + type: 'reference', + required: false, + }, +}; From 94ec4ad3d14b7321af2cb4196feb8bb0911b8b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Tue, 12 Sep 2023 13:37:38 +0200 Subject: [PATCH 04/25] Make `ObjectiveContributors` objective required --- src/db/ObjectiveContributors/props.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/db/ObjectiveContributors/props.js b/src/db/ObjectiveContributors/props.js index 6e7a0f7b7..8702ac074 100644 --- a/src/db/ObjectiveContributors/props.js +++ b/src/db/ObjectiveContributors/props.js @@ -5,6 +5,6 @@ export default { }, objective: { type: 'reference', - required: false, + required: true, }, }; From f801fe444078d7096207e7a1f73bef278f6243f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Tue, 12 Sep 2023 13:40:45 +0200 Subject: [PATCH 05/25] Switch to the official CEL comment syntax --- firestore.rules | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/firestore.rules b/firestore.rules index 7e037254e..8d391cf01 100644 --- a/firestore.rules +++ b/firestore.rules @@ -39,14 +39,14 @@ service cloud.firestore { return isSignedIn() && (isAdminOfOrg || isAdminFromOrgOfProdOrDep); } - /** - * Return true if the current user is an admin of the organization that - * `document` belongs to. - * - * The document can belong to an organization either by a transitive link - * (`document` → `parent` → `organization`) or directly - * (`document` → `parent`). - */ + // + // Return true if the current user is an admin of the organization that + // `document` belongs to. + // + // The document can belong to an organization either by a transitive link + // (`document` → `parent` → `organization`) or directly + // (`document` → `parent`). + // function isAdminOfParent(document, type) { let userDoc = getUserDoc(); let userIsAdmin = isAdmin(); @@ -78,9 +78,9 @@ service cloud.firestore { return userIsTeamMember; } - /** - * Return true if the current user is a member of `document.parent`. - */ + // + // Return true if the current user is a member of `document.parent`. + // function isMemberOfParent(document, type) { let userRef = /databases/$(database)/documents/users/$(request.auth.token.email); let doc = getAfter(/databases/$(database)/documents/$(type)/$(document)); @@ -89,10 +89,10 @@ service cloud.firestore { return userIsMemberOfParent; } - /** - * Return true if the current user is a member of the parent of the - * document's objective *before* performing the action. - */ + // + // Return true if the current user is a member of the parent of the + // document's objective *before* performing the action. + // function isMemberOfObjectiveParentBefore(document, type) { let userRef = /databases/$(database)/documents/users/$(request.auth.token.email); let doc = get(/databases/$(database)/documents/$(type)/$(document)); @@ -102,10 +102,10 @@ service cloud.firestore { return userIsMemberOfParent; } - /** - * Return true if the current user is a member of the parent of the - * document's objective *after* performing the action. - */ + // + // Return true if the current user is a member of the parent of the + // document's objective *after* performing the action. + // function isMemberOfObjectiveParentAfter(document, type) { let userRef = /databases/$(database)/documents/users/$(request.auth.token.email); let doc = getAfter(/databases/$(database)/documents/$(type)/$(document)); @@ -184,9 +184,7 @@ service cloud.firestore { allow delete: if isSuperAdmin(); } - /* - * TODO: Should also allow create/delete by organization admins. - */ + // TODO: Should also allow create/delete by organization admins. match /objectiveContributors/{document} { allow read: if isSignedIn(); allow create: if isSuperAdmin() || isMemberOfObjectiveParentAfter(document, 'objectiveContributors'); From 691d181641c0374160644d44a6719bdde4f42def Mon Sep 17 00:00:00 2001 From: "Petter H. Juliussen" Date: Thu, 7 Sep 2023 13:37:32 +0200 Subject: [PATCH 06/25] Stay on current view when navigating between items --- CHANGELOG.md | 2 ++ .../Navigation/header/OrganizationTree.vue | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 501e62c20..10355d7ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ All notable changes to this project will be documented in this file. The format them. This is meant to prevent accidental data loss in unsaved forms. - Items in the admin panel now links directly to each respective item about page with the edit drawer opened. +- The currently active item tab is now kept when navigating between + organizational items. ## [3.9.0] 2023-09-01 diff --git a/src/components/Navigation/header/OrganizationTree.vue b/src/components/Navigation/header/OrganizationTree.vue index 58692b094..5caf3813c 100644 --- a/src/components/Navigation/header/OrganizationTree.vue +++ b/src/components/Navigation/header/OrganizationTree.vue @@ -7,7 +7,7 @@ class="organization-tree__item organization-tree__item--organization" > Date: Wed, 6 Sep 2023 13:31:15 +0200 Subject: [PATCH 07/25] Make form validation less eager --- CHANGELOG.md | 2 + src/components/drawers/EditItemDrawer.vue | 6 +-- src/components/drawers/EditKeyResult.vue | 6 +-- src/components/drawers/EditObjective.vue | 6 +-- src/components/forms/KpiAdminForm.vue | 2 +- src/components/generic/form/FormSection.vue | 4 +- src/config/validation.js | 42 +++++++++++++++++++++ src/main.js | 33 +++------------- 8 files changed, 61 insertions(+), 40 deletions(-) create mode 100644 src/config/validation.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 10355d7ce..38e75aae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ All notable changes to this project will be documented in this file. The format with the edit drawer opened. - The currently active item tab is now kept when navigating between organizational items. +- Validation in forms are now less "eager" and errors are only displayed after + attempted form submissions. ## [3.9.0] 2023-09-01 diff --git a/src/components/drawers/EditItemDrawer.vue b/src/components/drawers/EditItemDrawer.vue index f20ea0f8f..9e8c45b1d 100644 --- a/src/components/drawers/EditItemDrawer.vue +++ b/src/components/drawers/EditItemDrawer.vue @@ -16,7 +16,7 @@