From 7a8a4619fae68402556a8aa494d1651683dee29c Mon Sep 17 00:00:00 2001
From: Eric <eashaw@sailsjs.com>
Date: Thu, 22 Aug 2024 21:25:30 -0600
Subject: [PATCH] Bulk operations dashboard: Update profile support (#21518)

Changes:
- Added missing `.json` support for configuration profiles.
---
 ee/bulk-operations-dashboard/api/models/UndeployedProfile.js  | 1 +
 .../assets/js/components/file-upload.component.js             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ee/bulk-operations-dashboard/api/models/UndeployedProfile.js b/ee/bulk-operations-dashboard/api/models/UndeployedProfile.js
index 53695260d1..2d13a1993f 100644
--- a/ee/bulk-operations-dashboard/api/models/UndeployedProfile.js
+++ b/ee/bulk-operations-dashboard/api/models/UndeployedProfile.js
@@ -35,6 +35,7 @@ module.exports = {
       isIn: [
         '.mobileconfig',
         '.xml',
+        '.json',
       ],
     },
 
diff --git a/ee/bulk-operations-dashboard/assets/js/components/file-upload.component.js b/ee/bulk-operations-dashboard/assets/js/components/file-upload.component.js
index c5e9357f94..d10816e7ab 100644
--- a/ee/bulk-operations-dashboard/assets/js/components/file-upload.component.js
+++ b/ee/bulk-operations-dashboard/assets/js/components/file-upload.component.js
@@ -96,7 +96,7 @@ parasails.registerComponent('fileUpload', {
             <label purpose="file-upload" for="file-upload-input">
               <img src="/images/upload-16x17@2x.png" style="height: 16px; width: 16px; margin-right: 8px">Choose File
             </label>
-            <input id="file-upload-input" type="file" class="file-input d-none" :disabled="isCurrentlyDisabled" accept=".xml,.mobileconfig" @change="changeFileInput($event)"/>
+            <input id="file-upload-input" type="file" class="file-input d-none" :disabled="isCurrentlyDisabled" accept=".xml,.mobileconfig,.json" @change="changeFileInput($event)"/>
           </div>
         </div>
       </div>
@@ -104,7 +104,7 @@ parasails.registerComponent('fileUpload', {
         <div class="d-flex flex-row justify-content-start">
           <img style="height: 40px; width: 34px;" src="/images/profile-34x40@2x.png">
           <div class="d-flex flex-column">
-            <p><strong>{{selectedFileName.replace(/\.(xml|mobileconfig)$/g, '').replace(/^\d{4}-\d{2}-\d{2}_/, '')}}</strong></p>
+            <p><strong>{{selectedFileName.replace(/\.(xml|mobileconfig|json)$/g, '').replace(/^\d{4}-\d{2}-\d{2}_/, '')}}</strong></p>
             <p class="muted" v-if="_.endsWith(selectedFileName, 'xml')">Windows</p>
             <p class="muted" v-else>macOS, iOS, iPadOS</p>
           </div>