Merge pull request #487 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippStandards/CippStandardAccordion.jsx

@@ -560,13 +560,33 @@ const CippStandardAccordion = ({
               selectedActions = [selectedActions];
             }
 
+            // Get template name for Intune Templates
+            let templateDisplayName = "";
+            if (standardName.startsWith("standards.IntuneTemplate")) {
+              // Check for TemplateList selection
+              const templateList = _.get(watchedValues, `${standardName}.TemplateList`);
+              if (templateList && templateList.label) {
+                templateDisplayName = templateList.label;
+              }
+              
+              // Check for TemplateList-Tags selection (takes priority)
+              const templateListTags = _.get(watchedValues, `${standardName}.TemplateList-Tags`);
+              if (templateListTags && templateListTags.label) {
+                templateDisplayName = templateListTags.label;
+              }
+            }
+            
+            // For multiple standards, check the first added component
             const selectedTemplateName = standard.multiple
               ? _.get(watchedValues, `${standardName}.${standard.addedComponent?.[0]?.name}`)
               : "";
-            const accordionTitle =
-              selectedTemplateName && _.get(selectedTemplateName, "label")
-                ? `${standard.label} - ${_.get(selectedTemplateName, "label")}`
-                : standard.label;
+            
+            // Build accordion title with template name if available
+            const accordionTitle = templateDisplayName
+              ? `${standard.label} - ${templateDisplayName}`
+              : selectedTemplateName && _.get(selectedTemplateName, "label")
+              ? `${standard.label} - ${_.get(selectedTemplateName, "label")}`
+              : standard.label;
 
             // Get current values and check if they differ from saved values
             const current = _.get(watchedValues, standardName);
@@ -809,6 +829,17 @@ const CippStandardAccordion = ({
                         {/* Additional components take full width */}
                         {hasAddedComponents && (
                           <>
+                            {/* Add catalog button for Intune Template standard - appears first */}
+                            {standardName.startsWith("standards.IntuneTemplate") && (
+                              <Grid size={12}>
+                                <Box sx={{ mb: 2 }}>
+                                  <CippPolicyImportDrawer
+                                    buttonText="Browse Intune Template Catalog"
+                                    mode="Intune"
+                                  />
+                                </Box>
+                              </Grid>
+                            )}
                             {standard.addedComponent?.map((component, idx) =>
                               component?.condition ? (
                                 <CippFormCondition

src/data/standards.json

@@ -4608,7 +4608,10 @@
           "queryKey": "ListIntuneTemplates-tag-autcomplete",
           "url": "/api/ListIntuneTemplates?mode=Tag",
           "labelField": "label",
-          "valueField": "value"
+          "valueField": "value",
+          "addedField": {
+            "templates": "templates"
+          }
         }
       },
       {