Merge pull request #153 from KelvinTegelaar/dev

Merging dev into master

BestPracticeAnalyserList.html

@@ -70,7 +70,6 @@ <h1 class="page-header-title">
     </div>
 </main>
 <script src="js/datatables/jquery.dataTables.js"></script>
-<script src="js/tenantlist.js"></script>
 <script src="js/datatables/datatablesBestPracticeAnalyser.js"></script>
 
 </body>
@@ -91,9 +90,7 @@ <h5 class="modal-title" id="exampleModalLabel">Results</h5>
                     </div></span>
                 </section>
             </div>
-            <div class="modal-footer"><button class="btn btn-secondary" type="button"
-                    data-bs-dismiss="modal">Close</button>
-            </div>
+
         </div>
     </div>
 

Documentation/Installation.md

@@ -2,7 +2,7 @@
 
 # Prerequisites
 
-For the installation and maintenance, we assume you have some knowledge of Github, and have setup the Secure Application Model prior to install. Haven't setup the Secure Application model yet? Check out [this](https://www.cyberdrain.com/connect-to-exchange-online-automated-when-mfa-is-enabled-using-the-secureapp-model/) script.
+For the installation and maintenance, we assume you have some knowledge of Github, and have setup the Secure Application Model prior to install. Haven't setup the Secure Application model yet? Check out [this](https://www.cyberdrain.com/connect-to-exchange-online-automated-when-mfa-is-enabled-using-the-secureapp-model/) script. For a step-by-step guide of how setting up the Secure Application Model, see [this](https://www.gavsto.com/secure-application-model-for-the-layman-and-step-by-step/).
 
 You'll also need the following permissions for your secure application model, to add permissions follow these instructions:
 
@@ -12,7 +12,7 @@ You'll also need the following permissions for your secure application model, to
 - Go to “API Permissions” and click Add a permission.
 - Choose “Microsoft Graph” and “Delegated permission” or "Application Permissions"
 - Add the permission you need.
-- Finally, click on “Grant Admin Consent for Company Name.
+- Finally, click on “Grant Admin Consent” for Company Name.
 
 ## Permissions
 
@@ -87,6 +87,7 @@ You'll need the following to get started;
 - A fork of [this](https://github.com/KelvinTegelaar/CIPP) repo
 - A fork of [this](https://github.com/KelvinTegelaar/CIPP-API) repo
 - An active Azure Subscription
+- A GitHub personal access token. You can find instructions on what you need and the minimum permissions to do this [here](https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token). You only need to follow the "Create a GitHub personal access token" section
 
 # Automated setup
 

README.md

@@ -11,8 +11,10 @@ The CyberDrain Improved Partner Portal is a portal to help manage administration
 
 This project is a way to help you with administration, with user management, and deploying your own prefered standards. It's not a replacement for security tools, or a way to cut costs on specific subscriptions. The tool should assist you in removing the gripes with standard partner management and save you several hours per engineer per month.
 
-# Beta at version 1.0.0?
-Yup! Because this is the first *public* release, we're still calling it beta. There's just been enough development to reach the 1.0 milestone.
+# Deployment and Getting Started
+
+If you want to self-host, check out the installation manual [here](Documentation/Installation.md). You will need some knowledge of Static Web Apps, Azure Functions, and Azure Keyvault
+
 # Why are you making this?
 
 I'm kind of done waiting for vendors to catch up to what we actually need. All RMM vendors are dramaticaly slow adopting cloud management. Microsoft themselves don't understand the Managed services markets, there are vendors that have tried jumping into the gap but either have unreasonable fees, weird constructions, require Global Admins without MFA, or just don't innovate at a pace that is required of cloud services right now.
@@ -97,10 +99,6 @@ The current build functionality is described below, also check out our Changelog
 - [ ] Monitor defaults across tenants.
 - [ ] Tenant Alerting
 
-# Deployment
-
-If you want to self-host, check out the installation manual [here](Documentation/Installation.md). You will need some knowledge of Static Web Apps, Azure Functions, and Azure Keyvault
-
 # Security
 Authentication is handled by Azure AD using static web apps security. This means the API is only reachable for authenticated users you've invited. For most of the security info related to that check out our staticwebapp.config.json and/or the doc pages on static web apps. Do you see something that might be a security risk, even the smallest? report it and we will handle it asap. Check out our security reporting options [here](https://github.com/KelvinTegelaar/CIPP/security)
 # Contributions

js/datatables/datatablesBestPracticeAnalyser.js

@@ -8,6 +8,7 @@ $(document).ready(function () {
     var todayDate = new Date().toISOString().slice(0, 10);
     $('.datatable-1').dataTable(
         {
+            "scrollX": true,
             language: {
                 paginate: {
                     next: '<i class="fas fa-arrow-right"></i>',
@@ -36,7 +37,8 @@ $(document).ready(function () {
                     text: 'Force Refresh All Data',
                     className: 'btn btn-primary btn-sm',
                     action: function (e, dt, button, config) {
-                        PostForm("None", '/api/BestPracticeAnalyser_OrchestrationStarter')
+                        $('#APIContent').html('<center><label class="form-check-label" >Are you sure you want to force the Best Practice Analysis to run? This will slow down normal usage considerably. Please note: this runs at midnight automatically every day. <br /><br /></label><br><nothing class="APIConfirmed"><a href="/api/BestPracticeAnalyser_OrchestrationStarter"><button id="Confirmed" class="btn btn-primary APIConfirmed">Yes</button></a></nothing><nothing class="APIDenied">  <button data-bs-dismiss="modal" class="btn btn-primary APIDenied">No</button></center>');
+
                         document.getElementById("PopModal").click();
                     }
                 }