[pull] main from KelvinTegelaar:main

.github/workflows/Assign_Issue_Volunteer.yml

@@ -5,6 +5,6 @@ jobs:
   build:
     runs-on: ubuntu-slim
     steps:
-      - uses: bhermann/issue-volunteer@v0.1.12
+      - uses: bhermann/issue-volunteer@v0.1.20
         with:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/Comment_on_Issues.yml

@@ -12,7 +12,7 @@ jobs:
       issues: write
     steps:
       - name: Add Comment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |

.github/workflows/auto_comments.yml

@@ -17,7 +17,7 @@ jobs:
       # 1) If the comment includes '!notasponsor', delete it using GitHub Script
       - name: Delete !notasponsor comment
         if: contains(github.event.comment.body, '!notasponsor')
-        uses: actions/github-script@v6
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -30,7 +30,7 @@ jobs:
       # 2) Post a sponsor-specific reply
       - name: Reply to !notasponsor
         if: contains(github.event.comment.body, '!notasponsor')
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
@@ -51,7 +51,7 @@ jobs:
       # 3) If the comment includes '!support', classify as a support request
       - name: Reply to !support
         if: contains(github.event.comment.body, '!support')
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
@@ -69,7 +69,7 @@ jobs:
       # 4) If the comment includes '!incomplete', note the bug or feature request is incomplete
       - name: Reply to !incomplete
         if: contains(github.event.comment.body, '!incomplete')
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |

.github/workflows/cipp_dev_build.yml

@@ -47,7 +47,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.3.1
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.7.0
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp

.github/workflows/cipp_frontend_build.yml

@@ -47,7 +47,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.3.1
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.7.0
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp

.github/workflows/label_sponsor_requests.yml

@@ -11,7 +11,7 @@ jobs:
       issues: write
     steps:
       - name: Sponsor Labels
-        uses: JasonEtco/is-sponsor-label-action@v1.2.0
+        uses: JasonEtco/is-sponsor-label-action@v2.0.0
         with:
           label: "Sponsor Priority"
         env:

.github/workflows/pr_check.yml

@@ -25,7 +25,7 @@ jobs:
           github.event.pull_request.head.repo.fork == true && 
           ((github.event.pull_request.head.ref == 'main' || github.event.pull_request.head.ref == 'master') ||
           (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'master'))
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.1.1",
+  "version": "10.1.2",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -51,7 +51,7 @@
     "@tiptap/extension-table": "^3.19.0",
     "@tiptap/pm": "^3.4.1",
     "@tiptap/react": "^3.4.1",
-    "@tiptap/starter-kit": "^3.19.0",
+    "@tiptap/starter-kit": "^3.20.0",
     "@uiw/react-json-view": "^2.0.0-alpha.41",
     "@vvo/tzdb": "^6.198.0",
     "apexcharts": "5.3.5",
@@ -61,9 +61,9 @@
     "export-to-csv": "^1.3.0",
     "formik": "2.4.9",
     "gray-matter": "4.0.3",
-    "i18next": "25.5.2",
+    "i18next": "25.8.13",
     "javascript-time-ago": "^2.6.2",
-    "jspdf": "^4.1.0",
+    "jspdf": "^4.2.0",
     "jspdf-autotable": "^5.0.7",
     "leaflet": "^1.9.4",
     "leaflet-defaulticon-compatibility": "^0.1.2",

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "10.1.1"
-}
+  "version": "10.1.2"
+}

src/components/CippComponents/CippAddUserDrawer.jsx

@@ -18,7 +18,7 @@ export const CippAddUserDrawer = ({
   const userSettingsDefaults = useSettings();
 
   const formControl = useForm({
-    mode: "onBlur",
+    mode: "onChange",
     defaultValues: {
       tenantFilter: userSettingsDefaults.currentTenant,
       usageLocation: userSettingsDefaults.usageLocation,
@@ -52,22 +52,36 @@ export const CippAddUserDrawer = ({
       }
       newFields.tenantFilter = userSettingsDefaults.currentTenant;
 
+      // Preserve the currently selected template when copying properties
+      const currentTemplate = formControl.getValues("userTemplate");
+      if (currentTemplate) {
+        newFields.userTemplate = currentTemplate;
+      }
+
       formControl.reset(newFields);
     }
   }, [formValues]);
 
   useEffect(() => {
     if (createUser.isSuccess) {
-      formControl.reset({
+      const resetValues = {
         tenantFilter: userSettingsDefaults.currentTenant,
         usageLocation: userSettingsDefaults.usageLocation,
-      });
+      };
+
+      // Preserve the default template if it exists
+      const currentTemplate = formControl.getValues("userTemplate");
+      if (currentTemplate?.addedFields?.defaultForTenant) {
+        resetValues.userTemplate = currentTemplate;
+      }
+
+      formControl.reset(resetValues);
     }
   }, [createUser.isSuccess]);
 
-  const handleSubmit = () => {
-    formControl.trigger();
-    if (!isValid) {
+  const handleSubmit = async () => {
+    const isFormValid = await formControl.trigger();
+    if (!isFormValid) {
       return;
     }
     const values = formControl.getValues();
@@ -84,17 +98,40 @@ export const CippAddUserDrawer = ({
 
   const handleCloseDrawer = () => {
     setDrawerVisible(false);
-    formControl.reset({
+    const resetValues = {
       tenantFilter: userSettingsDefaults.currentTenant,
       usageLocation: userSettingsDefaults.usageLocation,
-    });
+    };
+
+    // Preserve the default template if it exists
+    const currentTemplate = formControl.getValues("userTemplate");
+    if (currentTemplate?.addedFields?.defaultForTenant) {
+      resetValues.userTemplate = currentTemplate;
+    }
+
+    formControl.reset(resetValues);
+  };
+
+  const handleOpenDrawer = () => {
+    const resetValues = {
+      tenantFilter: userSettingsDefaults.currentTenant,
+      usageLocation: userSettingsDefaults.usageLocation,
+    };
+
+    const currentTemplate = formControl.getValues("userTemplate");
+    if (currentTemplate?.addedFields?.defaultForTenant) {
+      resetValues.userTemplate = currentTemplate;
+    }
+
+    formControl.reset(resetValues);
+    setDrawerVisible(true);
   };
 
   return (
     <>
       <PermissionButton
         requiredPermissions={requiredPermissions}
-        onClick={() => setDrawerVisible(true)}
+        onClick={handleOpenDrawer}
         startIcon={<PersonAdd />}
       >
         {buttonText}
@@ -117,8 +154,8 @@ export const CippAddUserDrawer = ({
                 {createUser.isPending
                   ? "Creating User..."
                   : createUser.isSuccess
-                  ? "Create Another User"
-                  : "Create User"}
+                    ? "Create Another User"
+                    : "Create User"}
               </Button>
               <Button variant="outlined" onClick={handleCloseDrawer}>
                 Close