From c06b2457fb81f0f5bc64d708fac3cedebffc1910 Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:03:37 +0100 Subject: [PATCH 01/11] [Check-in] Fix ordered list Closed #688 Signed-off-by: Bruce Becker --- .../joining-virtual-organisation/_index.md | 80 +++++++------------ 1 file changed, 30 insertions(+), 50 deletions(-) diff --git a/content/en/users/aai/check-in/joining-virtual-organisation/_index.md b/content/en/users/aai/check-in/joining-virtual-organisation/_index.md index eb80d546f2..9e34df78bd 100644 --- a/content/en/users/aai/check-in/joining-virtual-organisation/_index.md +++ b/content/en/users/aai/check-in/joining-virtual-organisation/_index.md @@ -15,58 +15,38 @@ in Check-in are represented as Collaborative Organisation Units (COUs). In order to join a Virtual Organisation you must have an EGI account. If you don't have, then first [sign up for an EGI account](../signup/). -1. Login to [Check-in registry](https://aai.egi.eu/registry) with your EGI account. - +1. Login to [Check-in registry](https://aai.egi.eu/registry) with your EGI + account. 1. Expand the **People** drop down menu and click **Enroll**. - ![COmanage-people-enroll](./check-in-people-enroll.png) - -1. Click the **Begin** link of the Enrollment flow of the VO you want to - join - +1. Click the **Begin** link of the Enrollment flow of the VO you want to join ![Join example](./check-in-join-example.png) - 1. Click the **Begin** button to start the Enrollment flow - ![Start enrollement flow](./check-in-start-enroll.png) - -1. - a. If there are no pending petitions the enrollment flow will continue as usual. - - b. If there is one pending petition: - - b1. If its status is in Pending Approval you will see a page similar to this: - - ![Pending Petition Under Approval](./check-in-pending-petition-approval.png) - - Where you can: - - * Click the **Notify Approver(s) Again** button and a reminder email will be sent to approver(s) - - * Click **Proceed with new enrollment**, so a new enrollment flow will start - - * Click **Delete and proceed with new enrollment**. - In this case, the pending petition will be deleted and a new enrollment flow will be created. - - b2. If its status is not in `Pending Approval`, `Pending Confirmation` or - `Finalized` you will see a page similar to this: - - ![Pending Petition](./check-in-pending-petition-created.png) - - Where you can: - - * Click the **Resume** button and continue the enrollment flow - - * Click **Proceed with new enrollment**, so a new enrollment flow will start - - * Click **Delete and proceed with new enrollment**. - In this case, the pending petition will be deleted and a new enrollment flow will start. - - c. If there is more than one pending petition related to the enrollment flow: - - ![Pending Petitions](./check-in-pending-petitions.png) - - Where you can: - * Click the **View** Button of each petition and review it. (see (b) use case above) - - * Click **Proceed with new enrollment** and a new enrollment flow will start +1. Handle pending petitions +1. If there are no pending petitions the enrollment flow will continue as usual. +1. If there is one pending petition: +1. If its status is in Pending Approval you will see a page similar to this: + ![Pending Petition Under Approval](./check-in-pending-petition-approval.png) + Here you can: + + - Click the **Notify Approver(s) Again** button and a reminder email will be + sent to approver(s) + - Click **Proceed with new enrollment**, so a new enrollment flow will start + - Click **Delete and proceed with new enrollment**. In this case, the pending + petition will be deleted and a new enrollment flow will be created. + +1. If its status is not in `Pending Approval`, `Pending Confirmation` or + `Finalized` you will see a page similar to this: + ![Pending Petition](./check-in-pending-petition-created.png) Hhere you can: + + - Click the **Resume** button and continue the enrollment flow + - Click **Proceed with new enrollment**, so a new enrollment flow will start + - Click **Delete and proceed with new enrollment**. In this case, the pending + petition will be deleted and a new enrollment flow will start. + +1. If there is more than one pending petition related to the enrollment flow: + ![Pending Petitions](./check-in-pending-petitions.png) Here you can: + + - Click the **View** Button of each petition and review it. (see above) + - Click **Proceed with new enrollment** and a new enrollment flow will start From d3762186de79015b55eb2da44c76608b847cf33d Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:10:50 +0100 Subject: [PATCH 02/11] [Check-in] chore: ignore commitmessage in prettier hook Signed-off-by: Bruce Becker --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a3bb039db4..31a6f03dae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,6 +10,7 @@ repos: args: - --config - .prettierrc.toml + exclude: COMMIT_EDITMSG - repo: https://github.com/python-jsonschema/check-jsonschema rev: 0.28.0 hooks: From 4622e14eea14ce9aa8851f432ff5bc2efa4442cc Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:11:03 +0100 Subject: [PATCH 03/11] [Check-in] chore: fix typo Closed #688 Signed-off-by: Bruce Becker --- .../users/aai/check-in/joining-virtual-organisation/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/users/aai/check-in/joining-virtual-organisation/_index.md b/content/en/users/aai/check-in/joining-virtual-organisation/_index.md index 9e34df78bd..74df2313dc 100644 --- a/content/en/users/aai/check-in/joining-virtual-organisation/_index.md +++ b/content/en/users/aai/check-in/joining-virtual-organisation/_index.md @@ -38,7 +38,7 @@ don't have, then first [sign up for an EGI account](../signup/). 1. If its status is not in `Pending Approval`, `Pending Confirmation` or `Finalized` you will see a page similar to this: - ![Pending Petition](./check-in-pending-petition-created.png) Hhere you can: + ![Pending Petition](./check-in-pending-petition-created.png) Here you can: - Click the **Resume** button and continue the enrollment flow - Click **Proceed with new enrollment**, so a new enrollment flow will start From 5f58967ae89e509b6fda928ca3da7c2cab4d040f Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:25:48 +0100 Subject: [PATCH 04/11] chore(spelling): add COMMIT_MSG to expected words for spelling action Signed-off-by: Bruce Becker --- .github/actions/spelling/patterns.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt index 53d9783ed1..ce9e1bab57 100644 --- a/.github/actions/spelling/patterns.txt +++ b/.github/actions/spelling/patterns.txt @@ -152,3 +152,4 @@ mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,} \ba2enmod\b \beduGAIN\b \b-field\b +\bCOMMIT_MSG\b \ No newline at end of file From f7d00f619ef029a7e3287af77909a0eeb89e8f0d Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:26:56 +0100 Subject: [PATCH 05/11] chore(spelling): add COMMIT_MSG to expected words for spelling action Signed-off-by: Bruce Becker --- .github/actions/spelling/expect.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 5379f3c59c..2c538971a7 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -37,3 +37,4 @@ unconfigured Unregistering workflows yyy +COMMIT_MSG \ No newline at end of file From b6e8bde324b29fef27541eff418eff0949c04576 Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:28:54 +0100 Subject: [PATCH 06/11] chore(spelling): add EDITMSG to expected words for spelling action Signed-off-by: Bruce Becker --- .github/actions/spelling/expect.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 2c538971a7..a7785eaa92 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -37,4 +37,5 @@ unconfigured Unregistering workflows yyy -COMMIT_MSG \ No newline at end of file +COMMIT_MSG +EDITMSG \ No newline at end of file From 82689cd05cc40d3b99d92bc5bb92beff9177ebea Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:33:13 +0100 Subject: [PATCH 07/11] chore: remove forbidden pattern from pattern Signed-off-by: Bruce Becker --- .github/actions/spelling/patterns.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt index ce9e1bab57..0f07a34602 100644 --- a/.github/actions/spelling/patterns.txt +++ b/.github/actions/spelling/patterns.txt @@ -151,5 +151,4 @@ mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,} \bmicrok8s\b \ba2enmod\b \beduGAIN\b -\b-field\b -\bCOMMIT_MSG\b \ No newline at end of file +\b-field\b \ No newline at end of file From 6e7f76b94b38008b3ee218f87455e406eb200f75 Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:46:49 +0100 Subject: [PATCH 08/11] chore: remove commit_msg from expect to remove forbidden pattern Signed-off-by: Bruce Becker --- .github/actions/spelling/expect.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index a7785eaa92..646a261992 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -37,5 +37,4 @@ unconfigured Unregistering workflows yyy -COMMIT_MSG EDITMSG \ No newline at end of file From 81b9e7d312bd632e385c74d5adfae58cd5457f51 Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:49:46 +0100 Subject: [PATCH 09/11] chore: add document start to pre-commit config Signed-off-by: Bruce Becker --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 31a6f03dae..4f09b070fa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,4 @@ +--- # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks repos: From e36d650797c30249f1fc270eb155a34ee9fcfa0c Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:54:51 +0100 Subject: [PATCH 10/11] chore: do you want new lines at the end of your files or not?? Signed-off-by: Bruce Becker --- .github/actions/spelling/expect.txt | 3 ++- .github/actions/spelling/patterns.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 646a261992..b81d9c3ec2 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -37,4 +37,5 @@ unconfigured Unregistering workflows yyy -EDITMSG \ No newline at end of file +COMMITMSG +EDITMSG diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt index 0f07a34602..53d9783ed1 100644 --- a/.github/actions/spelling/patterns.txt +++ b/.github/actions/spelling/patterns.txt @@ -151,4 +151,4 @@ mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,} \bmicrok8s\b \ba2enmod\b \beduGAIN\b -\b-field\b \ No newline at end of file +\b-field\b From 407a9a9c3b6086f33cae68f42d4f32204bd6c0e4 Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Thu, 9 Jan 2025 09:59:53 +0100 Subject: [PATCH 11/11] chore: add line end check to pre-commit Signed-off-by: Bruce Becker --- .pre-commit-config.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f09b070fa..c077738c8f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,11 @@ # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: end-of-file-fixer + - id: trailing-whitespace - repo: https://github.com/pre-commit/mirrors-prettier rev: v4.0.0-alpha.8 hooks: @@ -13,13 +18,13 @@ repos: - .prettierrc.toml exclude: COMMIT_EDITMSG - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.0 + rev: 0.31.0 hooks: - id: check-github-workflows # Disabling markdown-link-check because it can not reliably check anchors and links against the source code. # Suggest using lychee instead (way faster and more accurate) - repo: https://github.com/tcort/markdown-link-check - rev: v3.11.2 + rev: v3.13.6 hooks: - id: markdown-link-check args: