diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml new file mode 100644 index 000000000000..1f5a0ee5feb6 --- /dev/null +++ b/.github/workflows/dev_deploy.yml @@ -0,0 +1,45 @@ +name: CIPP Development Frontend CI/CD + +on: + push: + branches: + - dev + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - dev + +jobs: + build_and_deploy_job: + if: github.event.repository.fork == false && 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@v4 + with: + submodules: true + - 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 }} # change this to your repository secret name + 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.repository.fork == false && 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 }} # change this to your repository secret name + action: 'close' diff --git a/public/img/augmentt-dark.png b/public/img/augmentt-dark.png index 949d3eebe8d3..c10f55697569 100644 Binary files a/public/img/augmentt-dark.png and b/public/img/augmentt-dark.png differ diff --git a/public/img/augmentt-light.png b/public/img/augmentt-light.png index 882ebcd7f21e..2b73e846a9ef 100644 Binary files a/public/img/augmentt-light.png and b/public/img/augmentt-light.png differ diff --git a/src/views/cipp/Logs.jsx b/src/views/cipp/Logs.jsx index 0d339880d1ff..9e41020ced16 100644 --- a/src/views/cipp/Logs.jsx +++ b/src/views/cipp/Logs.jsx @@ -20,6 +20,7 @@ import { CippDatatable, cellDateFormatter, CellTip } from 'src/components/tables import { useNavigate } from 'react-router-dom' import DatePicker from 'react-datepicker' import 'react-datepicker/dist/react-datepicker.css' +import { cellGenericFormatter } from 'src/components/tables/CellGenericFormat' const reverseSort = (rowA, rowB) => { const a = rowA.DateTime.toLowerCase() const b = rowB.DateTime.toLowerCase() @@ -97,6 +98,11 @@ const columns = [ minWidth: '145px', maxWidth: '145px', }, + { + name: 'Data', + selector: (row) => row?.LogData, + cell: cellGenericFormatter(), + }, ] const Logs = () => {