Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: UWIT-IAM/uw-husky-directory
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.2.8
Choose a base ref
...
head repository: UWIT-IAM/uw-husky-directory
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 7 commits
  • 38 files changed
  • 2 contributors

Commits on Jan 21, 2025

  1. [GH-171] - Update deploy.yml to Send Notifications to Microsoft Teams…

    … and Align with Other Repos (#173)
    
    * fix(ci): Moving deploy.yml notifications to teams and aligning it with Identity.UW
    soufianerafik authored Jan 21, 2025
    Copy the full SHA
    2a9e35e View commit details

Commits on Jan 29, 2025

  1. [GH-174] - Allow all "whitepages email addresses" to appear for users…

    … on all screens (#175)
    
    * feat: Show all available employee emails
    * [Bot] Update version to 2.3.0
    
    ---------
    
    Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
    soufianerafik and github-actions[bot] authored Jan 29, 2025
    Copy the full SHA
    93bc02e View commit details

Commits on Jan 30, 2025

  1. Copy the full SHA
    df9b373 View commit details

Commits on Feb 1, 2025

  1. [GH-176] - Migrate from Google Container Registry (GCR) to Google Art…

    …ifact Registry (GAR), remove unused scripts (#180)
    
    * feat(ci): Update deploy workflows to use gar
    
    * feat(ci): Update globals.sh and add package-mode = false to pyproject.toml
    
    * feat(ci): Update pull-request.yml
    
    * feat(ci): Bump actions/checkout to v4 in deploy.yml
    
    * feat(ci): Delete configure-docker/action.yml
    
    * chore(ci): Remove old slack dependencies
    
    * chore(ci): Remove unused gcr-login.sh
    
    * chore(ci): update gcr reference to gar in push-release-image.sh
    
    * feat(ci): update create-release.yml to use gar
    
    * chore(ci): update gcr references in docs
    
    * chore(ci): update gcr references in run-development-server.sh
    
    * [Bot] Update version to 2.4.0
    
    ---------
    
    Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
    soufianerafik and github-actions[bot] authored Feb 1, 2025
    Copy the full SHA
    86ed4f3 View commit details

Commits on Feb 3, 2025

  1. [GH-181] - Update scheduled-maintenance.yml workflow (#183)

    * feat(ci): Update scheduled-maintenance.yml to use uwit-iam/action-setup-poetry-project@main
    soufianerafik authored Feb 3, 2025
    Copy the full SHA
    f7e44bd View commit details
  2. [GH-182] - Improved search results UI, CSS Refactoring and Cleanup (#185

    )
    
    * feat(frontend): Fix CSS issues and UI cleanups
    
    * feat(frontend): Remove unused css
    
    * [Bot] Update version to 2.4.1
    
    * fix(frontend): extend "listing type" width
    
    * fix(frontend): Update email separator to ','
    
    ---------
    
    Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
    soufianerafik and github-actions[bot] authored Feb 3, 2025
    Copy the full SHA
    0ec8031 View commit details

Commits on Feb 7, 2025

  1. [GH-188] - Add mobile phone number to summary search result (#189)

    * feat(frontend): Show first mobile phone if landline not available on summary view
    
    * [Bot] Update version to 2.4.2
    
    ---------
    
    Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
    soufianerafik and github-actions[bot] authored Feb 7, 2025
    Copy the full SHA
    4027569 View commit details
Showing with 450 additions and 580 deletions.
  1. +0 −31 .github/actions/configure-docker/action.yml
  2. +4 −1 .github/pull_request_template.md
  3. +0 −7 .github/scripts/gcr-login.sh
  4. +1 −1 .github/steps/create-release/push-release-image.sh
  5. +0 −16 .github/steps/deploy/canvas.json
  6. +0 −24 .github/steps/deploy/configure-canvas.sh
  7. +0 −102 .github/steps/deploy/get_slack_notification.sh
  8. +6 −17 .github/workflows/create-release.yml
  9. +178 −129 .github/workflows/deploy.yml
  10. +7 −23 .github/workflows/pull-request.yml
  11. +12 −7 .github/workflows/scheduled-maintenance.yml
  12. +1 −1 docs/deployment.md
  13. +7 −18 docs/docker.md
  14. +1 −1 docs/manual-deployments.md
  15. +1 −1 docs/running-the-app.md
  16. +1 −1 fingerprints.yaml
  17. +1 −1 husky_directory/models/search.py
  18. +1 −1 husky_directory/models/vcard.py
  19. +7 −5 husky_directory/services/translator.py
  20. +2 −2 husky_directory/services/vcard.py
  21. +32 −125 husky_directory/static/css/body.css
  22. +114 −3 husky_directory/static/css/print.css
  23. +1 −13 husky_directory/templates/base.html
  24. +39 −25 husky_directory/templates/full_result.html
  25. +0 −2 husky_directory/templates/full_results.html
  26. +1 −1 husky_directory/templates/links.html
  27. +1 −3 husky_directory/templates/result_count.html
  28. +1 −1 husky_directory/templates/search_options.html
  29. +1 −1 husky_directory/templates/summary_results_table/base.html
  30. +16 −6 husky_directory/templates/summary_results_table/scenario_population_block.html
  31. +2 −2 husky_directory/templates/vcard.vcf.jinja2
  32. +2 −1 pyproject.toml
  33. +1 −1 scripts/globals.sh
  34. +1 −1 scripts/run-development-server.sh
  35. +1 −1 tests/blueprints/test_search_blueprint.py
  36. +4 −2 tests/services/test_translator.py
  37. +2 −2 tests/services/test_vcard.py
  38. +1 −1 tox.ini
31 changes: 0 additions & 31 deletions .github/actions/configure-docker/action.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
**Change Description:** {{ FILL THIS IN }}

**Closes Jira(s)**: {{ FILL THIS IN }}
**Closes Github Issue(s)**: {{ FILL THIS IN }}

## UW-Directory Pull Request checklist

- [ ] A corresponding Github Issue has been created in [this repository](https://github.com/UWIT-IAM/uw-husky-directory/issues) to track this work
- [ ] I have run `poetry run tox`
- [ ] I have selected a `semver-guidance:` label for this pull request (under labels,
to the right of the screen)
-
If you do not do both of these things, your checks will either not run, or have a high probability of failing.
7 changes: 0 additions & 7 deletions .github/scripts/gcr-login.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/steps/create-release/push-release-image.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ function print_help {
Use: push-release-image.sh --version <semver> [--debug --help]
Options:
-v, --version (Required)
The release version you want to dockerize and push to gcr.
The release version you want to dockerize and push to gar.
--strict Die on any errors
-h, --help Show this message and exit
16 changes: 0 additions & 16 deletions .github/steps/deploy/canvas.json

This file was deleted.

24 changes: 0 additions & 24 deletions .github/steps/deploy/configure-canvas.sh

This file was deleted.

102 changes: 0 additions & 102 deletions .github/steps/deploy/get_slack_notification.sh

This file was deleted.

23 changes: 6 additions & 17 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
@@ -37,23 +37,12 @@ jobs:
# Creating "Release" artifacts falls under "contents: write"
contents: write
steps:
- uses: actions/checkout@v3
- uses: UWIT-IAM/actions/configure-gcloud-docker-gcloud-v101@0.1.17
with:
gcloud-token: ${{ secrets.GCR_TOKEN }}

- name: Set up Python 3.10
uses: actions/setup-python@v4
- uses: actions/checkout@v4
- name: Initialize Poetry & Install Tox & Finger Printer
uses: uwit-iam/action-setup-poetry-project@main
with:
python-version: '3.10'

- name: Install Poetry with pip
run: |
python -m pip install --upgrade pip
python -m pip install poetry
poetry --version
credentials: "${{ secrets.MCI_GCLOUD_AUTH_JSON }}"
enable_private_docker: true
- run: |
sudo apt-get -y install jq
poetry run pip install tox uw-it-build-fingerprinter
@@ -76,7 +65,7 @@ jobs:
if: github.ref == 'refs/heads/main'

- name: Push Docker image
run: docker push gcr.io/uwit-mci-iam/husky-directory:${{ env.version }}
run: docker push us-docker.pkg.dev/uwit-mci-iam/containers/husky-directory:${{ env.version }}
if: github.ref == 'refs/heads/main'

- name: Deploy
Loading