Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 🐛 Match the UI and API path for NotificationSource -> source #320

Merged
merged 7 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/320.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Homogenized the path for NotificationSources to `source` in UI and API
chadell marked this conversation as resolved.
Show resolved Hide resolved
12 changes: 6 additions & 6 deletions nautobot_circuit_maintenance/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
from . import views

router = routers.DefaultRouter()
router.register("maintenance", views.MaintenanceTaskView)
router.register("note", views.MaintenanceNoteTaskView)
router.register("circuitimpact", views.MaintenanceCircuitImpactTaskView)
router.register("notificationsource", views.NotificationSourceTaskView)
router.register("parsednotification", views.ParsedNotificationTaskView)
router.register("rawnotification", views.RawNotificationTaskView)
router.register("circuit-maintenances", views.MaintenanceTaskView)
router.register("notes", views.MaintenanceNoteTaskView)
router.register("circuit-impacts", views.MaintenanceCircuitImpactTaskView)
router.register("notification-sources", views.NotificationSourceTaskView)
router.register("parsed-notifications", views.ParsedNotificationTaskView)
router.register("raw-notifications", views.RawNotificationTaskView)

app_name = "nautobot_circuit_maintenance-api" # pylint: disable=invalid-name
urlpatterns = router.urls
84 changes: 42 additions & 42 deletions nautobot_circuit_maintenance/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,77 +10,77 @@

urlpatterns = [
# Overview
path("maintenance/overview/", views.CircuitMaintenanceOverview.as_view(), name="circuitmaintenance_overview"),
path("circuit-maintenances/overview/", views.CircuitMaintenanceOverview.as_view(), name="circuitmaintenance_overview"),
# Maintenance
path("maintenance/", views.CircuitMaintenanceListView.as_view(), name="circuitmaintenance_list"),
path("maintenance/add/", views.CircuitMaintenanceEditView.as_view(), name="circuitmaintenance_add"),
path("maintenance/import/", views.CircuitMaintenanceBulkImportView.as_view(), name="circuitmaintenance_import"),
path("maintenance/edit/", views.CircuitMaintenanceBulkEditView.as_view(), name="circuitmaintenance_bulk_edit"),
path("circuit-maintenances/", views.CircuitMaintenanceListView.as_view(), name="circuitmaintenance_list"),
path("circuit-maintenances/add/", views.CircuitMaintenanceEditView.as_view(), name="circuitmaintenance_add"),
path("circuit-maintenances/import/", views.CircuitMaintenanceBulkImportView.as_view(), name="circuitmaintenance_import"),
path("circuit-maintenances/edit/", views.CircuitMaintenanceBulkEditView.as_view(), name="circuitmaintenance_bulk_edit"),
path(
"maintenance/delete/", views.CircuitMaintenanceBulkDeleteView.as_view(), name="circuitmaintenance_bulk_delete"
"circuit-maintenances/delete/", views.CircuitMaintenanceBulkDeleteView.as_view(), name="circuitmaintenance_bulk_delete"
),
path("maintenance/<uuid:pk>/", views.CircuitMaintenanceView.as_view(), name="circuitmaintenance"),
path("maintenance/<uuid:pk>/edit/", views.CircuitMaintenanceEditView.as_view(), name="circuitmaintenance_edit"),
path("circuit-maintenances/<uuid:pk>/", views.CircuitMaintenanceView.as_view(), name="circuitmaintenance"),
path("circuit-maintenances/<uuid:pk>/edit/", views.CircuitMaintenanceEditView.as_view(), name="circuitmaintenance_edit"),
path(
"maintenance/<uuid:pk>/delete/", views.CircuitMaintenanceDeleteView.as_view(), name="circuitmaintenance_delete"
"circuit-maintenances/<uuid:pk>/delete/", views.CircuitMaintenanceDeleteView.as_view(), name="circuitmaintenance_delete"
),
path(
"maintenance/<uuid:pk>/changelog/",
"circuit-maintenances/<uuid:pk>/changelog/",
ObjectChangeLogView.as_view(),
name="circuitmaintenance_changelog",
kwargs={"model": CircuitMaintenance},
),
path("maintenance/job/", views.CircuitMaintenanceJobView.as_view(), name="circuitmaintenance_job"),
path("circuit-maintenances/job/", views.CircuitMaintenanceJobView.as_view(), name="circuitmaintenance_job"),
# Circuit Impact
path("impact/", views.CircuitImpactListView.as_view(), name="circuitimpact_list"),
path("impact/add/", views.CircuitImpactEditView.as_view(), name="circuitimpact_add"),
path("impact/<uuid:pk>/", views.CircuitImpactView.as_view(), name="circuitimpact"),
path("circuit-impacts/", views.CircuitImpactListView.as_view(), name="circuitimpact_list"),
path("circuit-impacts/add/", views.CircuitImpactEditView.as_view(), name="circuitimpact_add"),
path("circuit-impacts/<uuid:pk>/", views.CircuitImpactView.as_view(), name="circuitimpact"),
path(
"impact/<uuid:pk>/changelog/",
"circuit-impacts/<uuid:pk>/changelog/",
ObjectChangeLogView.as_view(),
name="circuitimpact_changelog",
kwargs={"model": CircuitImpact},
),
path("impact/<uuid:pk>/edit/", views.CircuitImpactEditView.as_view(), name="circuitimpact_edit"),
path("impact/<uuid:pk>/delete/", views.CircuitImpactDeleteView.as_view(), name="circuitimpact_delete"),
path("impact/edit/", views.CircuitImpactBulkEditView.as_view(), name="circuitimpact_bulk_edit"),
path("impact/delete/", views.CircuitImpactBulkDeleteView.as_view(), name="circuitimpact_bulk_delete"),
path("impact/import/", views.CircuitImpactBulkImportView.as_view(), name="circuitimpact_import"),
path("circuit-impacts/<uuid:pk>/edit/", views.CircuitImpactEditView.as_view(), name="circuitimpact_edit"),
path("circuit-impacts/<uuid:pk>/delete/", views.CircuitImpactDeleteView.as_view(), name="circuitimpact_delete"),
path("circuit-impacts/edit/", views.CircuitImpactBulkEditView.as_view(), name="circuitimpact_bulk_edit"),
path("circuit-impacts/delete/", views.CircuitImpactBulkDeleteView.as_view(), name="circuitimpact_bulk_delete"),
path("circuit-impacts/import/", views.CircuitImpactBulkImportView.as_view(), name="circuitimpact_import"),
# Notes
path("note/", views.NoteListView.as_view(), name="note_list"),
path("note/add/", views.NoteEditView.as_view(), name="note_add"),
path("note/<uuid:pk>/edit/", views.NoteEditView.as_view(), name="note_edit"),
path("note/<uuid:pk>/delete/", views.NoteDeleteView.as_view(), name="note_delete"),
path("note/<uuid:pk>/", views.NoteView.as_view(), name="note"),
path("note/edit/", views.NoteBulkEditView.as_view(), name="note_bulk_edit"),
path("note/delete/", views.NoteBulkDeleteView.as_view(), name="note_bulk_delete"),
path("note/import/", views.NoteBulkImportView.as_view(), name="note_import"),
path("note/<uuid:pk>/changelog/", ObjectChangeLogView.as_view(), name="note_changelog", kwargs={"model": Note}),
path("notes/", views.NoteListView.as_view(), name="note_list"),
path("notes/add/", views.NoteEditView.as_view(), name="note_add"),
path("notes/<uuid:pk>/edit/", views.NoteEditView.as_view(), name="note_edit"),
path("notes/<uuid:pk>/delete/", views.NoteDeleteView.as_view(), name="note_delete"),
path("notes/<uuid:pk>/", views.NoteView.as_view(), name="note"),
path("notes/edit/", views.NoteBulkEditView.as_view(), name="note_bulk_edit"),
path("notes/delete/", views.NoteBulkDeleteView.as_view(), name="note_bulk_delete"),
path("notes/import/", views.NoteBulkImportView.as_view(), name="note_import"),
path("notes/<uuid:pk>/changelog/", ObjectChangeLogView.as_view(), name="note_changelog", kwargs={"model": Note}),
# Raw Notification
path("rawnotification/", views.RawNotificationListView.as_view(), name="rawnotification_list"),
path("rawnotification/<uuid:pk>/", views.RawNotificationView.as_view(), name="rawnotification"),
path("rawnotification/<uuid:pk>/delete/", views.RawNotificationDeleteView.as_view(), name="rawnotification_delete"),
path("raw-notifications/", views.RawNotificationListView.as_view(), name="rawnotification_list"),
path("raw-notifications/<uuid:pk>/", views.RawNotificationView.as_view(), name="rawnotification"),
path("raw-notifications/<uuid:pk>/delete/", views.RawNotificationDeleteView.as_view(), name="rawnotification_delete"),
path(
"rawnotification/delete/",
"raw-notifications/delete/",
views.RawNotificationBulkDeleteView.as_view(),
name="rawnotification_bulk_delete",
),
# Parsed Notification
path(
"parsednotification/<uuid:pk>/",
"parsed-notifications/<uuid:pk>/",
views.ParsedNotificationView.as_view(),
name="parsednotification",
),
# Notification Source
path("source/", views.NotificationSourceListView.as_view(), name="notificationsource_list"),
path("source/google_authorize/<str:name>/", views.google_authorize, name="google_authorize"),
path("source/google_oauth2callback/", views.google_oauth2callback, name="google_oauth2callback"),
path("source/edit/", views.NotificationSourceBulkEditView.as_view(), name="notificationsource_bulk_edit"),
path("source/<uuid:pk>/edit/", views.NotificationSourceEditView.as_view(), name="notificationsource_edit"),
path("source/<uuid:pk>/", views.NotificationSourceView.as_view(), name="notificationsource"),
path("source/<uuid:pk>/validate/", views.NotificationSourceValidate.as_view(), name="notificationsource_validate"),
path("notification-sources/", views.NotificationSourceListView.as_view(), name="notificationsource_list"),
path("notification-sources/google_authorize/<str:name>/", views.google_authorize, name="google_authorize"),
path("notification-sources/google_oauth2callback/", views.google_oauth2callback, name="google_oauth2callback"),
path("notification-sources/edit/", views.NotificationSourceBulkEditView.as_view(), name="notificationsource_bulk_edit"),
path("notification-sources/<uuid:pk>/edit/", views.NotificationSourceEditView.as_view(), name="notificationsource_edit"),
path("notification-sources/<uuid:pk>/", views.NotificationSourceView.as_view(), name="notificationsource"),
path("notification-sources/<uuid:pk>/validate/", views.NotificationSourceValidate.as_view(), name="notificationsource_validate"),
path(
"source/<uuid:pk>/changelog/",
"notification-sources/<uuid:pk>/changelog/",
ObjectChangeLogView.as_view(),
name="notificationsource_changelog",
kwargs={"model": NotificationSource},
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "nautobot-circuit-maintenance"
version = "2.2.2"
version = "3.0.0"
description = "Nautobot app to automatically handle Circuit Maintenances Notifications"
authors = ["Network to Code, LLC <[email protected]>"]
license = "Apache-2.0"
Expand Down