Manual update

.github/workflows/azure-static-web-apps-polite-forest-010314b03.yml

@@ -0,0 +1,43 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - main
+
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          lfs: false
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_POLITE_FOREST_010314B03 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/" # App source code path
+          api_location: "" # Api source code path - optional
+          output_location: "" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_POLITE_FOREST_010314B03 }}
+          action: "close"

.gitignore

@@ -24,6 +24,11 @@ out
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+<<<<<<< HEAD
+__*
+.next/*
+=======
 
 # vscode debug logs
-debug.log
+debug.log
+>>>>>>> 81ee51ffa0576b02dc60ee5600a44cec3cde3e97

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+  "recommendations": [
+    "github.vscode-codeql",
+    "dbaeumer.vscode-eslint",
+    "christian-kohler.npm-intellisense",
+    "esbenp.prettier-vscode",
+    "stylelint.vscode-stylelint",
+    "editorconfig.editorconfig"
+  ]
+}

package.json

@@ -1,7 +1,12 @@
 {
   "name": "cipp",
+<<<<<<< HEAD
+  "version": "6.4.1",
+  "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
+=======
   "version": "7.0.0",
   "author": "CIPP Contributors",
+>>>>>>> 81ee51ffa0576b02dc60ee5600a44cec3cde3e97
   "homepage": "https://cipp.app/",
   "bugs": {
     "url": "https://github.com/KelvinTegelaar/CIPP/issues"
@@ -103,8 +108,42 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
+<<<<<<< HEAD
+    "@types/react": "^18.2.39",
+    "@types/react-helmet": "^6.1.5",
+    "@vitejs/plugin-react": "^4.2.1",
+    "auto-changelog": "~2.3.0",
+    "browserslist-to-esbuild": "^1.2.0",
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-custom-alias": "^1.3.2",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.4",
+    "husky": "^7.0.4",
+    "postcss-scss": "^4.0.3",
+    "prettier": "2.4.1",
+    "redux-immutable-state-invariant": "^2.1.0",
+    "sass": "^1.64.2",
+    "stylelint": "^14.3.0",
+    "stylelint-config-sass-guidelines": "^9.0.1",
+    "stylelint-order": "^5.0.0",
+    "vite": "^5.0.6",
+    "vite-plugin-eslint": "^1.8.1"
+  },
+  "engines": {
+    "node": "20.17.0",
+    "npm": ">=8.3.0"
+  },
+  "overrides": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+=======
     "@svgr/webpack": "6.5.1",
     "eslint": "8.32.0",
     "eslint-config-next": "13.1.6"
+>>>>>>> 81ee51ffa0576b02dc60ee5600a44cec3cde3e97
   }
 }

public/version_latest.txt

@@ -1 +1,5 @@
-99.99.99
+<<<<<<< HEAD
+6.4.1
+=======
+99.99.99
+>>>>>>> 81ee51ffa0576b02dc60ee5600a44cec3cde3e97

src/components/layout/AppFooter.jsx

@@ -0,0 +1,56 @@
+import React from 'react'
+import { CFooter, CImage, CLink } from '@coreui/react'
+import { Link } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import { useMediaPredicate } from 'react-media-hook'
+
+const AppFooter = () => {
+  const currentTheme = useSelector((state) => state.app.currentTheme)
+  const preferredTheme = useMediaPredicate('(prefers-color-scheme: dark)') ? 'impact' : 'cyberdrain'
+  const isDark =
+    currentTheme === 'impact' || (currentTheme === 'default' && preferredTheme === 'impact')
+
+  const RoB = isDark ? '/img/RoB.svg' : '/img/RoB-light.svg'
+  const huntress = isDark ? '/img/huntress_teal.png' : '/img/huntress_teal.png'
+  const rewst = isDark ? '/img/rewst_dark.png' : '/img/rewst.png'
+  const ninjaone = isDark ? '/img/ninjaone_dark.png' : '/img/ninjaone.png'
+  const augmentt = isDark ? '/img/augmentt-dark.png' : '/img/augmentt-light.png'
+
+  return (
+    <CFooter className="d-flex justify-content-between align-items-center stickyfooter">
+      <div className="sponsors">
+        <p>
+          This application is sponsored by
+          <CLink className="mx-2" href="https://www.huntress.com/" target="_blank">
+            <CImage src={huntress} alt="Huntress" />
+          </CLink>
+          <CLink
+            className="me-2"
+            href="https://www.rightofboom.com/rob-2025/register?promo=EarlyBird2025#register"
+            target="_blank"
+          >
+            <CImage src={RoB} alt="RoB" />
+          </CLink>
+          <CLink className="me-2" href="https://rewst.io/" target="_blank">
+            <CImage src={rewst} alt="Rewst" />
+          </CLink>
+          <CLink
+            className="me-1"
+            href="https://www.augmentt.com/?utm_source=cipp&utm_medium=referral&utm_campaign=2024"
+            target="_blank"
+          >
+            <CImage src={augmentt} alt="Augmentt" />
+          </CLink>
+          <CLink className="me-1" href="https://ninjaone.com" target="_blank">
+            <CImage src={ninjaone} alt="NinjaOne" />
+          </CLink>
+        </p>
+      </div>
+      <nav className="footer-nav">
+        <Link to="/license">License</Link>
+      </nav>
+    </CFooter>
+  )
+}
+
+export default React.memo(AppFooter)

src/components/tables/CippDatatable.jsx

@@ -0,0 +1,68 @@
+import React from 'react'
+import { useListDatatableQuery } from 'src/store/api/datatable'
+import PropTypes from 'prop-types'
+import { CippTable } from 'src/components/tables'
+import { CippTablePropTypes } from 'src/components/tables/CippTable'
+import { CCallout } from '@coreui/react'
+
+export default function CippDatatable({ path, params, ...rest }) {
+  const [graphFilter, setGraphFilter] = React.useState(params?.Parameters?.$filter)
+  const {
+    data = [],
+    isFetching,
+    error,
+    refetch,
+  } = useListDatatableQuery({ path, params: { $filter: graphFilter, ...params } })
+
+  let anonymized = false // Assuming default value is false
+  const regex = new RegExp('^[A-Z0-9]+$')
+  const principalNameOrUPN =
+    data[0]?.userPrincipalName ??
+    data[0]?.UPN ??
+    data[0]?.Owner ??
+    data.Results?.[0]?.upn ??
+    data.Results?.[0]?.userPrincipalName ??
+    data.Results?.[0]?.Owner
+
+  if (principalNameOrUPN && regex.test(principalNameOrUPN)) {
+    anonymized = true
+  }
+
+  var defaultFilterText = ''
+  if (params?.Parameters?.$filter) {
+    defaultFilterText = 'Graph: ' + params?.Parameters?.$filter
+  }
+  return (
+    <>
+      {anonymized && (
+        <CCallout color="info">
+          This table might contain anonymized data. Please check this
+          <a
+            className="m-1"
+            href="https://docs.cipp.app/troubleshooting/frequently-asked-questions#my-usernames-or-sites-are-guids-or-blank"
+          >
+            documentation link
+          </a>
+          to resolve this.
+        </CCallout>
+      )}
+      {data?.Metadata?.Queued && <CCallout color="info">{data?.Metadata?.QueueMessage}</CCallout>}
+      <CippTable
+        {...rest}
+        endpointName={path}
+        data={Array.isArray(data?.Results) ? data?.Results : data}
+        isFetching={isFetching}
+        error={error}
+        defaultFilterText={defaultFilterText}
+        refreshFunction={() => refetch()}
+        graphFilterFunction={setGraphFilter}
+      />
+    </>
+  )
+}
+
+CippDatatable.propTypes = {
+  path: PropTypes.string.isRequired,
+  params: PropTypes.object,
+  ...CippTablePropTypes,
+}