nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/ui/webpack.config.js

@@ -0,0 +1,148 @@
+'use strict'
+
+import path from 'node:path';
+import autoprefixer from 'autoprefixer';
+import miniCssExtractPlugin from 'mini-css-extract-plugin'
+
+const __dirname = import.meta.dirname;
+
+export default [
+    {
+        mode: 'production',
+        devtool: 'source-map',
+        entry: {
+            nautobot: path.resolve('src', 'js', 'nautobot.js'),
+        },
+        output: {
+            filename: 'js/[name].js',
+            path: path.resolve(__dirname, '..', 'project-static', 'dist')
+        },
+        optimization: {
+            splitChunks: {
+                chunks: 'all',
+                name: 'libraries'
+            }
+        },
+        plugins: [
+            new miniCssExtractPlugin(
+                {
+                    filename: 'css/[name].css'
+                }
+            )
+        ],
+        module: {
+            rules: [
+                {
+                    test: /\.(s?css)$/,
+                    use: [
+                        {
+                            loader: miniCssExtractPlugin.loader
+                        },
+                        {
+                            loader: 'css-loader'
+                        },
+                        {
+                            loader: 'postcss-loader',
+                            options: {
+                                postcssOptions: {
+                                    plugins: [
+                                        autoprefixer
+                                    ]
+                                }
+                            }
+                        },
+                        {
+                            loader: 'sass-loader',
+                            options: {
+                                sassOptions: {
+                                    quietDeps: true,
+                                    silenceDeprecations: ['import']
+                                }
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    {
+        mode: 'production',
+        devtool: 'source-map',
+        entry: {
+            "nautobot-graphiql": path.resolve('src', 'js', 'nautobot-graphiql.js')
+        },
+        output: {
+            filename: 'js/[name].js',
+            path: path.resolve(__dirname, '..', 'project-static', 'dist')
+        },
+        optimization: {
+            splitChunks: {
+                chunks: 'all',
+                name: 'graphql-libraries'
+            }
+        },
+        plugins: [
+            new miniCssExtractPlugin(
+                {
+                    filename: 'css/[name].css'
+                }
+            )
+        ],
+        module: {
+            rules: [
+                {
+                    test: /\.(css)$/,
+                    use: [
+                        {
+                            loader: miniCssExtractPlugin.loader
+                        },
+                        {
+                            loader: 'css-loader'
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    {
+        mode: 'production',
+        devtool: 'source-map',
+        entry: {
+            materialdesignicons: '@mdi/font/css/materialdesignicons.css',
+        },
+        output: {
+            filename: 'js/[name].js',
+            path: path.resolve(__dirname, '..', 'project-static', 'dist')
+        },
+        plugins: [
+            new miniCssExtractPlugin(
+                {
+                    filename: 'css/[name].css',
+                    chunkFilename: 'css/[id].css',
+                }
+            )
+        ],
+        module: {
+            rules: [
+                {
+                    test: /\.(css|scss)$/,
+                    use: [
+                        {
+                            loader: miniCssExtractPlugin.loader
+                        },
+                        {
+                            loader: 'css-loader'
+                        },
+                        {
+                            loader: 'sass-loader'
+                        }
+                    ]
+                },
+                {
+                    test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
+                    type: 'asset/resource'
+                }
+            ]
+        }
+    }
+]

nautobot/users/apps.py

@@ -5,3 +5,6 @@ class UsersConfig(NautobotConfig):
     default = True
     name = "nautobot.users"
     verbose_name = "Users"
+
+    # Flag for version control app to skip versioning user app models
+    is_version_controlled = False

nautobot/users/filters.py

@@ -1,9 +1,9 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
-import django_filters
 
 from nautobot.core.filters import (
     BaseFilterSet,
+    ModelMultipleChoiceFilter,
     NameSearchFilterSet,
     NaturalKeyOrPKMultipleChoiceFilter,
     RelatedMembershipBooleanFilter,
@@ -39,22 +39,21 @@ class UserFilterSet(BaseFilterSet):
     )
     # TODO(timizuo): Collapse groups_id and groups into single NaturalKeyOrPKMultipleChoiceFilter; This cant be done now
     #  because Group uses integer as its pk field and NaturalKeyOrPKMultipleChoiceFilter do not properly handle this yet
-    groups_id = django_filters.ModelMultipleChoiceFilter(
+    groups_id = ModelMultipleChoiceFilter(
         field_name="groups",
         queryset=Group.objects.all(),
         label="Group (ID)",
     )
-    groups = django_filters.ModelMultipleChoiceFilter(
+    groups = ModelMultipleChoiceFilter(
         field_name="groups__name",
         queryset=Group.objects.all(),
         to_field_name="name",
-        label="Group (name)",
     )
     has_object_changes = RelatedMembershipBooleanFilter(
         field_name="object_changes",
         label="Has Changes",
     )
-    object_changes = django_filters.ModelMultipleChoiceFilter(
+    object_changes = ModelMultipleChoiceFilter(
         field_name="object_changes",
         queryset=ObjectChange.objects.all(),
         label="Object Changes (ID)",
@@ -66,17 +65,15 @@ class UserFilterSet(BaseFilterSet):
     object_permissions = NaturalKeyOrPKMultipleChoiceFilter(
         to_field_name="name",
         queryset=ObjectPermission.objects.all(),
-        label="Object Permission (ID or name)",
     )
     has_rack_reservations = RelatedMembershipBooleanFilter(
         field_name="rack_reservations",
         label="Has Rack Reservations",
     )
     # TODO(timizuo): Since RackReservation has no natural-key field, NaturalKeyOrPKMultipleChoiceFilter can't be used
-    rack_reservations_id = django_filters.ModelMultipleChoiceFilter(
+    rack_reservations_id = ModelMultipleChoiceFilter(
         field_name="rack_reservations",
         queryset=RackReservation.objects.all(),
-        label="Rack Reservation (ID)",
     )
 
     class Meta:
@@ -104,16 +101,15 @@ class ObjectPermissionFilterSet(BaseFilterSet, NameSearchFilterSet):
     users = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=get_user_model().objects.all(),
         to_field_name="username",
-        label="User (ID or username)",
     )
     # TODO(timizuo): Collapse groups_id and groups into single NaturalKeyOrPKMultipleChoiceFilter; This cant be done now
     #  because Group uses integer as its pk field and NaturalKeyOrPKMultipleChoiceFilter do not properly handle this yet
-    groups_id = django_filters.ModelMultipleChoiceFilter(
+    groups_id = ModelMultipleChoiceFilter(
         field_name="groups",
         queryset=Group.objects.all(),
         label="Group (ID)",
     )
-    groups = django_filters.ModelMultipleChoiceFilter(
+    groups = ModelMultipleChoiceFilter(
         field_name="groups__name",
         queryset=Group.objects.all(),
         to_field_name="name",

nautobot/users/forms.py

@@ -75,6 +75,16 @@ class PreferenceProfileSettingsForm(BootstrapMixin, forms.Form):
     timezone = TimeZoneFormField(required=False, help_text="Set your default timezone", widget=StaticSelect2)
 
 
+class NavbarFavoritesAddForm(forms.Form):
+    link = forms.CharField()
+    name = forms.CharField()
+    tab_name = forms.CharField()
+
+
+class NavbarFavoritesRemoveForm(forms.Form):
+    link = forms.CharField()
+
+
 class AdminPasswordChangeForm(_AdminPasswordChangeForm):
     def save(self, commit=True):
         # Override `_AdminPasswordChangeForm.save()` to publish admin change user password event

nautobot/users/models.py

@@ -170,6 +170,14 @@ class User(BaseModel, AbstractUser):
 
     clear_config.alters_data = True
 
+    @property
+    def navbar_favorites(self):
+        return self.get_config("navbar_favorites", [])
+
+    @property
+    def navbar_favorites_link_list(self):
+        return [item.get("link") for item in self.navbar_favorites]
+
 
 #
 # Proxy models for admin

nautobot/users/templates/users/advanced_settings_edit.html

@@ -1,33 +1,43 @@
 {% extends 'users/base.html' %}
 {% load form_helpers %}
 
-{% block title %}Advanced Settings{% endblock %}
-
 {% block usercontent %}
-    <form action="." method="post" class="form form-horizontal col-md-10 col-md-offset-1">
+    <form action="." method="post" class="h-100 vstack">
         {% csrf_token %}
-        {% if form.non_field_errors %}
-            <div class="panel panel-danger">
-                <div class="panel-heading"><strong>Errors</strong></div>
-                <div class="panel-body">
-                    {{ form.non_field_errors }}
-                </div>
-            </div>
-        {% endif %}
-        <div class="panel panel-default">
-            <div class="panel-heading"><strong>Advanced Settings</strong></div>
-            <div class="panel-body">
-                {% render_field form.request_profiling %}
-                {% if request.user.is_superuser %}
-                    <div class="col-md-9 col-md-offset-3">
-                        <a href="{% url 'silk:summary' %}">Silk Request Profiling Dashboard</a>
+        <div class="row align-content-start flex-fill">
+            <div class="col-md-8 offset-md-2">
+                {% if form.non_field_errors %}
+                    <div class="card border-danger">
+                        <div class="card-header bg-danger-subtle border-danger text-body">
+                            <strong>Errors</strong>
+                        </div>
+                        <div class="card-body">
+                            {{ form.non_field_errors }}
+                        </div>
                     </div>
                 {% endif %}
+                <div class="card">
+                    <div class="card-header"><strong>Advanced Settings</strong></div>
+                    <div class="card-body">
+                        {% render_field form.request_profiling %}
+                        {% if request.user.is_superuser %}
+                            <div class="col-md-9 offset-md-3">
+                                <a href="{% url 'silk:summary' %}">Silk Request Profiling Dashboard</a>
+                            </div>
+                        {% endif %}
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="text-right">
-            <button type="submit" name="_update" class="btn btn-primary">Update</button>
-            <a href="{% url 'user:profile' %}" class="btn btn-default">Cancel</a>
+        <div class="nb-form-sticky-footer">
+            <button type="submit" name="_update" class="btn btn-primary">
+                <span aria-hidden="true" class="mdi mdi-check me-4"></span><!--
+                -->Update
+            </button>
+            <a href="{% url 'user:profile' %}" class="btn btn-secondary">
+                <span aria-hidden="true" class="mdi mdi-close me-4"></span><!--
+                -->Cancel
+            </a>
         </div>
     </form>
 {% endblock %}

nautobot/users/templates/users/api_tokens.html

@@ -1,67 +1,77 @@
 {% extends 'users/base.html' %}
 {% load helpers %}
 
-{% block title %}API Tokens{% endblock %}
-
 {% block usercontent %}
-    <div class="row">
-        <div class="col-md-12">
-            {% for token in tokens %}
-                <div class="panel panel-{% if token.is_expired %}danger{% else %}default{% endif %}">
-                    <div class="panel-heading">
-                        <div class="pull-right noprint">
-                            <a class="btn btn-xs btn-success copy-token" data-clipboard-target="#token_{{ token.pk }}">Copy</a>
-                            {% if perms.users.change_token %}
-                                <a href="{% url 'user:token_edit' pk=token.pk %}" class="btn btn-xs btn-warning">Edit</a>
-                            {% endif %}
-                            {% if perms.users.delete_token %}
-                                <a href="{% url 'user:token_delete' pk=token.pk %}" class="btn btn-xs btn-danger">Delete</a>
-                            {% endif %}
-                        </div>
-                        <i class="mdi mdi-key"></i>
-                        <samp><span id="token_{{ token.pk }}">{{ token.key }}</span></samp>
-                        {% if token.is_expired %}
-                            <span class="label label-danger">Expired</span>
-                        {% endif %}
-                    </div>
-                    <div class="panel-body">
-                        <div class="row">
-                            <div class="col-md-4">
-                                <small class="text-muted">Created</small><br />
-                                <span title="{{ token.created }}">{{ token.created|date }}</span>
-                            </div>
-                            <div class="col-md-4">
-                                <small class="text-muted">Expires</small><br />
-                                {% if token.expires %}
-                                    <span title="{{ token.expires }}">{{ token.expires|date }}</span>
-                                {% else %}
-                                    <span>Never</span>
+    <div class="h-100 vstack">
+        <div class="row align-content-start flex-fill">
+            <div class="col-md-8 offset-md-2">
+                {% for token in tokens %}
+                    <div class="card{% if token.is_expired %} border-danger{% endif %}">
+                        <div class="card-header nb-text-none{% if token.is_expired %} bg-danger-subtle border-danger text-body{% endif %}">
+                            <div class="d-print-none float-end">
+                                <a class="btn btn-sm btn-success copy-token" data-clipboard-target="#token_{{ token.pk }}">
+                                    <span class="mdi mdi-content-copy me-4" aria-hidden="true"></span><!--
+                                    -->Copy</a>
+                                {% if perms.users.change_token %}
+                                    <a href="{% url 'user:token_edit' pk=token.pk %}" class="btn btn-sm btn-warning">
+                                        <span class="mdi mdi-pencil me-4" aria-hidden="true"></span><!--
+                                        -->Edit
+                                    </a>
                                 {% endif %}
-                            </div>
-                            <div class="col-md-4">
-                                <small class="text-muted">Create/edit/delete operations</small><br />
-                                {% if token.write_enabled %}
-                                    <span class="label label-success">Enabled</span>
-                                {% else %}
-                                    <span class="label label-danger">Disabled</span>
+                                {% if perms.users.delete_token %}
+                                    <a href="{% url 'user:token_delete' pk=token.pk %}" class="btn btn-sm btn-danger">
+                                        <span class="mdi mdi-trash-can-outline me-4" aria-hidden="true"></span><!--
+                                        -->Delete
+                                    </a>
                                 {% endif %}
                             </div>
+                            <span aria-hidden="true" class="mdi mdi-key"></span>
+                            <samp><span id="token_{{ token.pk }}">{{ token.key }}</span></samp>
+                            {% if token.is_expired %}
+                                <span class="badge bg-danger">Expired</span>
+                            {% endif %}
+                        </div>
+                        <div class="card-body">
+                            <div class="row">
+                                <div class="col-md-4 gap-4 vstack">
+                                    <small class="text-secondary">Created</small>
+                                    <span title="{{ token.created }}">{{ token.created|date }}</span>
+                                </div>
+                                <div class="col-md-4 gap-4 vstack">
+                                    <small class="text-secondary">Expires</small>
+                                    {% if token.expires %}
+                                        <span title="{{ token.expires }}">{{ token.expires|date }}</span>
+                                    {% else %}
+                                        <span>Never</span>
+                                    {% endif %}
+                                </div>
+                                <div class="col-md-4 gap-4 vstack align-items-start">
+                                    <small class="text-secondary">Create/edit/delete operations</small>
+                                    {% if token.write_enabled %}
+                                        <span class="badge bg-success">Enabled</span>
+                                    {% else %}
+                                        <span class="badge bg-danger">Disabled</span>
+                                    {% endif %}
+                                </div>
+                            </div>
+                            {% if token.description %}
+                                <br /><span>{{ token.description }}</span>
+                            {% endif %}
                         </div>
-                        {% if token.description %}
-                            <br /><span>{{ token.description }}</span>
-                        {% endif %}
                     </div>
-                </div>
-            {% empty %}
-                <p>You do not have any API tokens.</p>
-            {% endfor %}
+                {% empty %}
+                    <p>You do not have any API tokens.</p>
+                {% endfor %}
+            </div>
+        </div>
+        <div class="nb-form-sticky-footer">
             {% if perms.users.add_token %}
                 <a href="{% url 'user:token_add' %}" class="btn btn-primary">
-                    <span class="mdi mdi-plus-thick" aria-hidden="true"></span>
-                    Add a token
+                    <span class="mdi mdi-plus-thick me-4" aria-hidden="true"></span><!--
+                    -->Add a token
                 </a>
             {% else %}
-                <div class="alert alert-info text-center" role="alert">
+                <div class="alert alert-info mb-0 text-center" role="alert">
                     You do not have permission to create new API tokens. If needed, ask an administrator to enable token creation for your account or an assigned group.
                 </div>
             {% endif %}

nautobot/users/templates/users/base.html

@@ -1,35 +1,27 @@
 {% extends 'base.html' %}
 
+{% block header %}
+    <ul class="nav nav-tabs" role="tablist">
+        <li class="nav-item" role="presentation">
+            <a href="{% url 'user:profile' %}" class="nav-link{% if active_tab == "profile" %} active{% endif %}">Profile</a>
+        </li>
+        <li class="nav-item" role="presentation">
+            <a href="{% url 'user:preferences' %}" class="nav-link{% if active_tab == "preferences" %} active{% endif %}">Preferences</a>
+        </li>
+        {% if is_django_auth_user %}
+            <li class="nav-item" role="presentation">
+                <a href="{% url 'user:change_password' %}" class="nav-link{% if active_tab == "change_password" %} active{% endif %}">Change Password</a>
+            </li>
+        {% endif %}
+        <li class="nav-item" role="presentation">
+            <a href="{% url 'user:token_list' %}" class="nav-link{% if active_tab == "api_tokens" %} active{% endif %}">API Tokens</a>
+        </li>
+        <li class="nav-item" role="presentation">
+            <a href="{% url 'user:advanced_settings_edit' %}" class="nav-link{% if active_tab == "advanced_settings" %} active{% endif %}">Advanced Settings</a>
+        </li>
+    </ul>
+{% endblock %}
+
 {% block content %}
-    <div class="row">
-        <div class="col-sm-12 col-md-10 col-md-offset-1">
-            <h1>{% block title %}{% endblock %}</h1>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-3 col-md-2 col-md-offset-1">
-            <ul class="nav nav-pills nav-stacked">
-                <li{% if active_tab == "profile" %} class="active"{% endif %}>
-                    <a href="{% url 'user:profile' %}">Profile</a>
-                </li>
-                <li{% if active_tab == "preferences" %} class="active"{% endif %}>
-                    <a href="{% url 'user:preferences' %}">Preferences</a>
-                </li>
-                {% if is_django_auth_user %}
-                    <li{% if active_tab == "change_password" %} class="active"{% endif %}>
-                        <a href="{% url 'user:change_password' %}">Change Password</a>
-                    </li>
-                {% endif %}
-                <li{% if active_tab == "api_tokens" %} class="active"{% endif %}>
-                    <a href="{% url 'user:token_list' %}">API Tokens</a>
-                </li>
-                <li{% if active_tab == "advanced_settings" %} class="active"{% endif %}>
-                    <a href="{% url 'user:advanced_settings_edit' %}">Advanced Settings</a>
-                </li>
-            </ul>
-        </div>
-        <div class="col-sm-9 col-md-8">
-            {% block usercontent %}{% endblock %}
-        </div>
-    </div>
+    {% block usercontent %}{% endblock %}
 {% endblock %}

nautobot/users/templates/users/change_password.html

@@ -1,30 +1,40 @@
 {% extends 'users/base.html' %}
 {% load form_helpers %}
 
-{% block title %}Change Password{% endblock %}
-
 {% block usercontent %}
-    <form action="." method="post" class="form form-horizontal col-md-10 col-md-offset-1">
+    <form action="." method="post" class="h-100 vstack">
         {% csrf_token %}
-        {% if form.non_field_errors %}
-            <div class="panel panel-danger">
-                <div class="panel-heading"><strong>Errors</strong></div>
-                <div class="panel-body">
-                    {{ form.non_field_errors }}
+        <div class="row align-content-start flex-fill">
+            <div class="col-md-8 offset-md-2">
+                {% if form.non_field_errors %}
+                    <div class="card border-danger">
+                        <div class="card-header bg-danger-subtle border-danger text-body">
+                            <strong>Errors</strong>
+                        </div>
+                        <div class="card-body">
+                            {{ form.non_field_errors }}
+                        </div>
+                    </div>
+                {% endif %}
+                <div class="card">
+                    <div class="card-header"><strong>Password</strong></div>
+                    <div class="card-body">
+                        {% render_field form.old_password %}
+                        {% render_field form.new_password1 %}
+                        {% render_field form.new_password2 %}
+                    </div>
                 </div>
             </div>
-        {% endif %}
-        <div class="panel panel-default">
-            <div class="panel-heading"><strong>Password</strong></div>
-            <div class="panel-body">
-                {% render_field form.old_password %}
-                {% render_field form.new_password1 %}
-                {% render_field form.new_password2 %}
-            </div>
         </div>
-        <div class="text-right">
-            <button type="submit" name="_update" class="btn btn-primary">Update</button>
-            <a href="{% url 'user:profile' %}" class="btn btn-default">Cancel</a>
+        <div class="nb-form-sticky-footer">
+            <button type="submit" name="_update" class="btn btn-primary">
+                <span aria-hidden="true" class="mdi mdi-check me-4"></span><!--
+                -->Update
+            </button>
+            <a href="{% url 'user:profile' %}" class="btn btn-secondary">
+                <span aria-hidden="true" class="mdi mdi-close me-4"></span><!--
+                -->Cancel
+            </a>
         </div>
     </form>
 {% endblock %}