(WIP)ft: DeviceCtl GUI refactor#86

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.

Sign up for GitHub

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

Open
Genza999 wants to merge 6 commits into
base:draft-pr-branch
Choose a base branch
from
Open

(WIP)ft: DeviceCtl GUI refactor #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ed246c
ft: move ports view and create ports tab
Genza999 Apr 26, 2024
f1a8673
reset removed code
Genza999 Apr 26, 2024
34fcb3f
fix: resolve error onload
Genza999 Apr 29, 2024
55dd753
fix: refactor implementation to show virtualports table
Genza999 Apr 30, 2024
2f50a3e
ft: add model for ports information and refute click propagation from…
Genza999 May 1, 2024
26e8d3e
refactor: additon and edition of ports
Genza999 May 6, 2024
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
3 changes: 2 additions & 1 deletion src/django_devicectl/rest/serializers/devicectl.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,7 @@ def get_virtual_port_name(self, port):
@register
class VirtualPort(TagMixin, ModelSerializer):
physical_ports = serializers.SerializerMethodField()
logical_port = LogicalPort()
device = serializers.SerializerMethodField()
port = serializers.SerializerMethodField()
tags = serializers.SerializerMethodField()
Expand All@@ -262,7 +263,7 @@ class Meta:
]

def get_physical_ports(self, obj):
return InlinePhysicalPort(obj.physical_ports.all(), many=True).data
return PhysicalPort(obj.physical_ports.all(), many=True).data

def get_device(self, obj):
return obj.device.id
Expand Down
269 changes: 252 additions & 17 deletions src/django_devicectl/static/devicectl/v2/devicectl.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,14 +27,6 @@ $ctl.application.Devicectl = $tc.extend(
return new $ctl.application.Devicectl.DeviceDetails();
});

this.tool("logical_ports", () => {
return new $ctl.application.Devicectl.LogicalPorts();
});

this.tool("physical_ports", () => {
return new $ctl.application.Devicectl.PhysicalPorts();
});

this.tool("virtual_ports", () => {
return new $ctl.application.Devicectl.VirtualPorts();
});
Expand DownExpand Up@@ -89,9 +81,7 @@ $ctl.application.Devicectl = $tc.extend(

$('#ports-tab').on('show.bs.tab', () => {
$('[data-element=button_create_facility]').hide();
$('[data-component=virtual_ports').appendTo($("#device-detail"));
$('[data-component=logical_ports').appendTo($("#device-detail"));
$('[data-component=physical_ports').appendTo($("#device-detail"));
$('[data-component=virtual_ports').appendTo($("#allports"));
});

$('#tab-overview').on('show.bs.tab', () => {
Expand All@@ -101,9 +91,6 @@ $ctl.application.Devicectl = $tc.extend(
$($ctl).trigger("init_tools", [this]);

this.$t.devices.activate();
this.$t.logical_ports.activate();
this.$t.physical_ports.activate();
this.$t.virtual_ports.activate();

this.sync();

Expand DownExpand Up@@ -187,8 +174,6 @@ $ctl.application.Devicectl.DeviceSelect = $tc.extend(

sync : function() {
$ctl.devicectl.$t.virtual_ports.sync();
$ctl.devicectl.$t.logical_ports.sync();
$ctl.devicectl.$t.physical_ports.sync();
$ctl.devicectl.$t.device.show_device(this.element.val());
},

Expand DownExpand Up@@ -1391,6 +1376,10 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
if (!grainy.check(data.grainy, "d")) {
button_delete.element.hide();
}

row.click(() =>{
new $ctl.application.Devicectl.PortsViewInformation(data);
});
};

this.$w.list.format_request_url = (url) => {
Expand DownExpand Up@@ -1444,6 +1433,88 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
$ctl.application.Tool
);

$ctl.application.Devicectl.PortsViewInformation = $tc.extend(
"PortsViewInformation",
{
PortsViewInformation: function (data) {
var title = "Virtual Ports - " + data.display_name;
var element = $('<div>');

var dataContent = `
<div class="row mb-3">
<label class="form-label">Name</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${data.display_name}" readonly/>
</div>

<div class="row mb-3">
<label class="form-label">Logical Port</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port_name}" readonly/>
</div>

<div class="row mb-3">
<label class="form-label">VLAN ID</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${data.vlan_id}" readonly/>
</div>

<h5 class="modal-title">Logical Port - ${data.logical_port.name}</h5>
<br>
<div class="row mb-3">
<label class="form-label">Name</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.name}" readonly/>
</div>

<div class="row mb-3">
<label class="form-label">Channel</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.channel}" readonly/>
</div>

<div class="row mb-3">
<label class="form-label">Trunk</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.trunk}" readonly/>
</div>

<div class="row mb-3">
<label class="form-label">Description</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.description}" readonly/>
</div>

<h5 class="modal-title">Physical Ports</h5>

`;

data.physical_ports.forEach(function(physical_port, index){
dataContent += `
<h5 class="modal-title">Physical Port - ${physical_port.display_name}</h5>
<br>
<div class="row mb-3">
<label class="form-label">Name</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.name}" readonly/>
</div>

<div class="row mb-3">
<label class="form-label">Device</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.device_name}" readonly/>
</div>

<div class="row mb-3">
<label class="form-label">Logical Port</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.logical_port_name}" readonly/>
</div>

<div class="row mb-3">
<label class="form-label">Description</label>
<input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.description}" readonly/>
</div>
`;
})
element.append(dataContent);

this.Modal("no_button_lg", title, element);
}
},
$ctl.application.Modal
);

$ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
"ModalVirtualPort",
{
Expand All@@ -1453,6 +1524,7 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
var form = this.form = new twentyc.rest.Form(
$ctl.template("form_virtual_port")
);
var LogicalPortsList = [];

var logical_port_select = this.logical_port_select = new twentyc.rest.Select(
form.element.find('select[name="logical_port"]')
Expand All@@ -1465,14 +1537,141 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
logical_port_select.load().then(() => {
if (virtual_port) { logical_port_select.element.val(virtual_port.logical_port) }
});

console.log(virtual_port)

$.ajax({
url: `/api/facility/digital_reality/${fullctl.devicectl.facility_slug()}/logical_ports/`,
type: 'GET',
success: function(response) {
logical_ports_data = response.data
response.data.forEach(function(data) {
LogicalPortsList.push({
logical_ports_name: data.display_name
});
});
},
error: function(xhr, status, error) {
console.error(xhr.responseText);
},
async: false
});
// channel
var logical_port_channel = form.element.find('input[name="logical_port_channel"]');
if (virtual_port) {
logical_port_channel.val(virtual_port.logical_port.channel)
}

// trunk
var logical_port_trunk = form.element.find('input[name="logical_port_trunk"]')
if (virtual_port) {
logical_port_trunk.val(virtual_port.logical_port.trunk)
}

// description
var logical_port_description = form.element.find('input[name="logical_port_description"]');
if (virtual_port) {
logical_port_description.val(virtual_port.logical_port.description)
}
this.virtual_port = virtual_port;

physical_ports = form.element.find('.physical-ports-container');

// Creation of a Port
if (!virtual_port) {
var phyical_data_content = `
<div class="row mb-3">
<div class="col-12" data-api-submit="yes">
<label for="physical_port-name" class="form-label">Name</label>
<input type="text" class="form-control" id="physical_port-name" name="physical_port_name" />
</div>
</div>
<div class="row mb-3">
<div class="col-12" data-api-submit="yes">
<label for="physical_port-device" class="form-label">Device</label>
<span class="modal-control">
<input type="text" class="form-control" id="device-name" name="physical_port_device_name" disabled />
<input type="hidden" name="device" id="device">
</span>
</div>
</div>
<div class="row mb-3">
<div class="col-12" data-api-submit="yes">
<label for="physical_port-logical_port" class="form-label">Logical Port</label>
<span class="modal-control">
<select
data-api-action="" class="form-control" id="physical_port-logical_port" name="physical_logical_port">
<select>
</span>
</div>
</div>
<div class="row mb-3">
<div class="col-12" data-api-submit="yes">
<label for="physical_port-description" class="form-label">Description</label>
<input type="text" class="form-control" id="physical_port-description" name="physical_port_description" />
</div>
</div>
`
physical_ports.append(phyical_data_content)
var logical_ports_select = form.element.find('#physical_port-logical_port');
logical_ports_select.append($('<option>').attr('value', '').text('Create matching logical port'));

$.each(LogicalPortsList, function(index, logical_port) {
var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
logical_ports_select.append(option);
});
}

if (virtual_port) {
title = "Edit " + virtual_port.display_name;
title = "Edit Virtual Port" + virtual_port.display_name;
form.method = "PUT"
form.form_action = virtual_port.id;
form.fill(virtual_port);

virtual_port.physical_ports.forEach(function(port, index){
var physicaldataContent = `
<div class="row mb-3">
<div class="col-12" data-api-submit="yes">
<label for="physical_port-name" class="form-label">Physical Port Name</label>
<input type="text" class="form-control" id="physical_port-name" name="physical_port_name_${index}" value="${port.display_name}"/>
</div>
</div>
<div class="row mb-3">
<div class="col-12" data-api-submit="yes">
<label for="physical_port-device" class="form-label">Device</label>
<input type="text" class="form-control" name="physical_port_device_name_${index}" id="device" value="${port.device_name}" disabled>
</div>
</div>
<div class="row mb-3">
<div class="col-12" data-api-submit="yes">
<label for="physical_port-logical_port_${index}" class="form-label">Logical Port</label>
<span class="modal-control">
<select
data-api-action="" class="form-control" id="physical_port-logical_port_${index}" name="physical_logical_port_${index}">
<select>
</span>
</div>
</div>
<div class="row mb-3">
<div class="col-12" data-api-submit="yes">
<label for="physical_port-description" class="form-label">Description</label>
<input type="text" class="form-control" id="physical_port-description" name="physical_port_description_${index}" value="${port.description}" />
</div>
</div>
<hr style="border-color: #000; border-width: 2px;">
`
physical_ports.append(physicaldataContent)

var logical_ports_select = form.element.find(`#physical_port-logical_port_${index}`);
logical_ports_select.append($('<option>').attr('value', '').text(`${port.logical_port_name}`));

$.each(LogicalPortsList, function(index, logical_port) {
if (port.logical_port_name !== logical_port.logical_ports_name) {
var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
logical_ports_select.append(option);
}
})
});

form.element.find('input[type="text"],select,input[type="checkbox"]').each(function () {
if (!grainy.check(virtual_port.grainy + "." + $(this).attr("name"), "u")) {
Expand All@@ -1483,6 +1682,42 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(

$(this.form).on("api-write:before", (ev, e, payload) => {
payload["id"] = virtual_port.id;
payload["physical_ports"] = []
payload.logical_port_data = {
channel: payload.logical_port_channel,
description: payload.logical_port_description,
name: payload.logical_port_name,
trunk: payload.logical_port_trunk
}
delete payload.logical_port_channel;
delete payload.logical_port_description;
delete payload.logical_port_name;
delete payload.logical_port_trunk;

var count = 0;
for (var key in payload) {
// Check if the key starts with "physical"
if (key.startsWith("physical")) {
// Increment the count
count++;
}
}
iterate_times = count / 4

for (var i = 0; i < iterate_times; i++) {
payload.physical_ports.push({
name: payload[`physical_port_name_${i}`],
device_name: payload[`physical_port_device_name_${i}`],
logical_port: payload[`physical_logical_port_${i}`],
description: payload[`physical_port_description_${i}`],
})

delete payload[`physical_port_name_${i}`];
delete payload[`physical_port_device_name_${i}`];
delete payload[`physical_logical_port_${i}`];
delete payload[`physical_port_description_${i}`];
}

});
}

Expand Down
Empty file addedsrc/django_devicectl/static/devicectl/v2/ports/ports.js
View file
Open in desktop
Empty file.
3 changes: 0 additions & 3 deletions src/django_devicectl/templates/devicectl/v2/base.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,9 +165,6 @@
</div>
<div class="device-container" style="display:none">
{% include "devicectl/v2/tool/device/main.html" %}
{% include "devicectl/v2/tool/virtual_ports/main.html" %}
{% include "devicectl/v2/tool/logical_ports/main.html" %}
{% include "devicectl/v2/tool/physical_ports/main.html" %}
</div>
</div>
</div>
Expand Down
8 changes: 8 additions & 0 deletions src/django_devicectl/templates/devicectl/v2/tool/device/main.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
<li class="nav-item" role="presentation">
<a class="nav-link" id="history-tab" data-bs-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
</li>
<li class="nav-item" role="presentation">
<a class="nav-link" id="allports-tab" data-bs-toggle="tab" href="#allports" role="tab" aria-controls="allports" aria-selected="false">Ports</a>
</li>

</ul>

Expand DownExpand Up@@ -56,6 +59,10 @@
<div class="tab-pane fade" id="history" role="tabpanel" data-element="config_history_container" aria-labelledby="history-tab">

</div>
<!-- Ports Tab -->
<div class="tab-pane fade" id="allports" role="tabpanel" data-element="all_ports_container" aria-labelledby="allports-tab">

</div>

</div>

Expand All@@ -71,6 +78,7 @@
{% include "devicectl/v2/tool/device/config-current.html" %}
{% include "devicectl/v2/tool/device/config-reference.html" %}
{% include "devicectl/v2/tool/device/reports.html" %}
{% include "devicectl/v2/tool/device/ports.html" %}

</div>
</div>
4 changes: 4 additions & 0 deletions src/django_devicectl/templates/devicectl/v2/tool/device/ports.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
{% load static i18n %}
<div data-template="all_ports" >
{% include "devicectl/v2/tool/virtual_ports/main.html" %}
</div>
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
(WIP)ft: DeviceCtl GUI refactor#86

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.

 Sign up for GitHub

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

 Open

Genza999
wants to merge
6
commits into

base:draft-pr-branch
Choose a base branch

from

 Open


(WIP)ft: DeviceCtl GUI refactor
#86
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8ed246c

ft: move ports view and create ports tab


Genza999 Apr 26, 2024
f1a8673

reset removed code


Genza999 Apr 26, 2024
34fcb3f

fix: resolve error onload


Genza999 Apr 29, 2024
55dd753

fix: refactor implementation to show virtualports table


Genza999 Apr 30, 2024
2f50a3e

ft: add model for ports information and refute click propagation from…


Genza999 May 1, 2024
26e8d3e

refactor: additon and edition of ports


Genza999 May 6, 2024

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


3 changes: 2 additions & 1 deletion
src/django_devicectl/rest/serializers/devicectl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,7 @@ def get_virtual_port_name(self, port):
@register
class VirtualPort(TagMixin, ModelSerializer):
 physical_ports = serializers.SerializerMethodField()
 logical_port = LogicalPort()
 device = serializers.SerializerMethodField()
 port = serializers.SerializerMethodField()
 tags = serializers.SerializerMethodField()
Expand All@@ -262,7 +263,7 @@ class Meta:
 ]

 def get_physical_ports(self, obj):
 return InlinePhysicalPort(obj.physical_ports.all(), many=True).data
 return PhysicalPort(obj.physical_ports.all(), many=True).data

 def get_device(self, obj):
 return obj.device.id
Expand Down

269 changes: 252 additions & 17 deletions
src/django_devicectl/static/devicectl/v2/devicectl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,14 +27,6 @@ $ctl.application.Devicectl = $tc.extend(
 return new $ctl.application.Devicectl.DeviceDetails();
 });

 this.tool("logical_ports", () => {
 return new $ctl.application.Devicectl.LogicalPorts();
 });

 this.tool("physical_ports", () => {
 return new $ctl.application.Devicectl.PhysicalPorts();
 });

 this.tool("virtual_ports", () => {
 return new $ctl.application.Devicectl.VirtualPorts();
 });
Expand DownExpand Up@@ -89,9 +81,7 @@ $ctl.application.Devicectl = $tc.extend(

 $('#ports-tab').on('show.bs.tab', () => {
 $('[data-element=button_create_facility]').hide();
 $('[data-component=virtual_ports').appendTo($("#device-detail"));
 $('[data-component=logical_ports').appendTo($("#device-detail"));
 $('[data-component=physical_ports').appendTo($("#device-detail"));
 $('[data-component=virtual_ports').appendTo($("#allports"));
 });

 $('#tab-overview').on('show.bs.tab', () => {
Expand All@@ -101,9 +91,6 @@ $ctl.application.Devicectl = $tc.extend(
 $($ctl).trigger("init_tools", [this]);

 this.$t.devices.activate();
 this.$t.logical_ports.activate();
 this.$t.physical_ports.activate();
 this.$t.virtual_ports.activate();

 this.sync();

Expand DownExpand Up@@ -187,8 +174,6 @@ $ctl.application.Devicectl.DeviceSelect = $tc.extend(

 sync : function() {
 $ctl.devicectl.$t.virtual_ports.sync();
 $ctl.devicectl.$t.logical_ports.sync();
 $ctl.devicectl.$t.physical_ports.sync();
 $ctl.devicectl.$t.device.show_device(this.element.val());
 },

Expand DownExpand Up@@ -1391,6 +1376,10 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 if (!grainy.check(data.grainy, "d")) {
 button_delete.element.hide();
 }

 row.click(() =>{
 new $ctl.application.Devicectl.PortsViewInformation(data);
 });
 };

 this.$w.list.format_request_url = (url) => {
Expand DownExpand Up@@ -1444,6 +1433,88 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 $ctl.application.Tool
);

$ctl.application.Devicectl.PortsViewInformation = $tc.extend(
 "PortsViewInformation",
 {
 PortsViewInformation: function (data) {
 var title = "Virtual Ports - " + data.display_name;
 var element = $('<div>');

 var dataContent = `
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.display_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">VLAN ID</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.vlan_id}" readonly/>
 </div>

 <h5 class="modal-title">Logical Port - ${data.logical_port.name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Channel</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.channel}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Trunk</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.trunk}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.description}" readonly/>
 </div>

 <h5 class="modal-title">Physical Ports</h5>

 `;

 data.physical_ports.forEach(function(physical_port, index){
 dataContent += `
 <h5 class="modal-title">Physical Port - ${physical_port.display_name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Device</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.device_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.description}" readonly/>
 </div>
 `;
 })
 element.append(dataContent);

 this.Modal("no_button_lg", title, element);
 }
},
 $ctl.application.Modal
);

$ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 "ModalVirtualPort",
 {
Expand All@@ -1453,6 +1524,7 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 var form = this.form = new twentyc.rest.Form(
 $ctl.template("form_virtual_port")
 );
 var LogicalPortsList = [];

 var logical_port_select = this.logical_port_select = new twentyc.rest.Select(
 form.element.find('select[name="logical_port"]')
Expand All@@ -1465,14 +1537,141 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 logical_port_select.load().then(() => {
 if (virtual_port) { logical_port_select.element.val(virtual_port.logical_port) }
 });

 console.log(virtual_port)

 $.ajax({
 url: `/api/facility/digital_reality/${fullctl.devicectl.facility_slug()}/logical_ports/`,
 type: 'GET',
 success: function(response) {
 logical_ports_data = response.data
 response.data.forEach(function(data) {
 LogicalPortsList.push({
 logical_ports_name: data.display_name
 });
 });
 },
 error: function(xhr, status, error) {
 console.error(xhr.responseText);
 },
 async: false
 });
 // channel
 var logical_port_channel = form.element.find('input[name="logical_port_channel"]');
 if (virtual_port) { 
 logical_port_channel.val(virtual_port.logical_port.channel) 
 }

 // trunk
 var logical_port_trunk = form.element.find('input[name="logical_port_trunk"]')
 if (virtual_port) { 
 logical_port_trunk.val(virtual_port.logical_port.trunk) 
 }

 // description
 var logical_port_description = form.element.find('input[name="logical_port_description"]');
 if (virtual_port) { 
 logical_port_description.val(virtual_port.logical_port.description)
 }
 this.virtual_port = virtual_port;

 physical_ports = form.element.find('.physical-ports-container');

 // Creation of a Port
 if (!virtual_port) {
 var phyical_data_content = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name" />
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <span class="modal-control">
 <input type="text" class="form-control" id="device-name" name="physical_port_device_name" disabled />
 <input type="hidden" name="device" id="device">
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port" name="physical_logical_port">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description" />
 </div>
 </div>
 `
 physical_ports.append(phyical_data_content)
 var logical_ports_select = form.element.find('#physical_port-logical_port');
 logical_ports_select.append($('<option>').attr('value', '').text('Create matching logical port'));

 $.each(LogicalPortsList, function(index, logical_port) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 });
 }

 if (virtual_port) {
 title = "Edit " + virtual_port.display_name;
 title = "Edit Virtual Port" + virtual_port.display_name;
 form.method = "PUT"
 form.form_action = virtual_port.id;
 form.fill(virtual_port);

 virtual_port.physical_ports.forEach(function(port, index){
 var physicaldataContent = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Physical Port Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name_${index}" value="${port.display_name}"/>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <input type="text" class="form-control" name="physical_port_device_name_${index}" id="device" value="${port.device_name}" disabled>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port_${index}" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port_${index}" name="physical_logical_port_${index}">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description_${index}" value="${port.description}" />
 </div>
 </div>
 <hr style="border-color: #000; border-width: 2px;">
 `
 physical_ports.append(physicaldataContent)

 var logical_ports_select = form.element.find(`#physical_port-logical_port_${index}`);
 logical_ports_select.append($('<option>').attr('value', '').text(`${port.logical_port_name}`));

 $.each(LogicalPortsList, function(index, logical_port) {
 if (port.logical_port_name !== logical_port.logical_ports_name) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 }
 })
 });

 form.element.find('input[type="text"],select,input[type="checkbox"]').each(function () {
 if (!grainy.check(virtual_port.grainy + "." + $(this).attr("name"), "u")) {
Expand All@@ -1483,6 +1682,42 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(

 $(this.form).on("api-write:before", (ev, e, payload) => {
 payload["id"] = virtual_port.id;
 payload["physical_ports"] = []
 payload.logical_port_data = {
 channel: payload.logical_port_channel,
 description: payload.logical_port_description,
 name: payload.logical_port_name,
 trunk: payload.logical_port_trunk
 }
 delete payload.logical_port_channel;
 delete payload.logical_port_description;
 delete payload.logical_port_name;
 delete payload.logical_port_trunk;

 var count = 0;
 for (var key in payload) {
 // Check if the key starts with "physical"
 if (key.startsWith("physical")) {
 // Increment the count
 count++;
 }
 }
 iterate_times = count / 4

 for (var i = 0; i < iterate_times; i++) {
 payload.physical_ports.push({
 name: payload[`physical_port_name_${i}`],
 device_name: payload[`physical_port_device_name_${i}`],
 logical_port: payload[`physical_logical_port_${i}`],
 description: payload[`physical_port_description_${i}`],
 })

 delete payload[`physical_port_name_${i}`];
 delete payload[`physical_port_device_name_${i}`];
 delete payload[`physical_logical_port_${i}`];
 delete payload[`physical_port_description_${i}`];
 }

 });
 }

Expand Down
Empty file addedsrc/django_devicectl/static/devicectl/v2/ports/ports.js

View file


Open in desktop


Empty file.


3 changes: 0 additions & 3 deletions
src/django_devicectl/templates/devicectl/v2/base.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,9 +165,6 @@
 </div>
 <div class="device-container" style="display:none">
 {% include "devicectl/v2/tool/device/main.html" %}
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
 {% include "devicectl/v2/tool/logical_ports/main.html" %}
 {% include "devicectl/v2/tool/physical_ports/main.html" %}
 </div>
 </div>
</div>
Expand Down

8 changes: 8 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="history-tab" data-bs-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
 </li>
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="allports-tab" data-bs-toggle="tab" href="#allports" role="tab" aria-controls="allports" aria-selected="false">Ports</a>
 </li>

 </ul>

Expand DownExpand Up@@ -56,6 +59,10 @@
 <div class="tab-pane fade" id="history" role="tabpanel" data-element="config_history_container" aria-labelledby="history-tab">

 </div>
 <!-- Ports Tab -->
 <div class="tab-pane fade" id="allports" role="tabpanel" data-element="all_ports_container" aria-labelledby="allports-tab">

 </div>

 </div>

Expand All@@ -71,6 +78,7 @@
 {% include "devicectl/v2/tool/device/config-current.html" %}
 {% include "devicectl/v2/tool/device/config-reference.html" %}
 {% include "devicectl/v2/tool/device/reports.html" %}
 {% include "devicectl/v2/tool/device/ports.html" %}

 </div>
</div>

4 changes: 4 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/ports.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
{% load static i18n %}
<div data-template="all_ports" >
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
</div>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
(WIP)ft: DeviceCtl GUI refactor#86

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.

 Sign up for GitHub

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

 Open

Genza999
wants to merge
6
commits into

base:draft-pr-branch
Choose a base branch

from

 Open


(WIP)ft: DeviceCtl GUI refactor
#86
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8ed246c

ft: move ports view and create ports tab


Genza999 Apr 26, 2024
f1a8673

reset removed code


Genza999 Apr 26, 2024
34fcb3f

fix: resolve error onload


Genza999 Apr 29, 2024
55dd753

fix: refactor implementation to show virtualports table


Genza999 Apr 30, 2024
2f50a3e

ft: add model for ports information and refute click propagation from…


Genza999 May 1, 2024
26e8d3e

refactor: additon and edition of ports


Genza999 May 6, 2024

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


3 changes: 2 additions & 1 deletion
src/django_devicectl/rest/serializers/devicectl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,7 @@ def get_virtual_port_name(self, port):
@register
class VirtualPort(TagMixin, ModelSerializer):
 physical_ports = serializers.SerializerMethodField()
 logical_port = LogicalPort()
 device = serializers.SerializerMethodField()
 port = serializers.SerializerMethodField()
 tags = serializers.SerializerMethodField()
Expand All@@ -262,7 +263,7 @@ class Meta:
 ]

 def get_physical_ports(self, obj):
 return InlinePhysicalPort(obj.physical_ports.all(), many=True).data
 return PhysicalPort(obj.physical_ports.all(), many=True).data

 def get_device(self, obj):
 return obj.device.id
Expand Down

269 changes: 252 additions & 17 deletions
src/django_devicectl/static/devicectl/v2/devicectl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,14 +27,6 @@ $ctl.application.Devicectl = $tc.extend(
 return new $ctl.application.Devicectl.DeviceDetails();
 });

 this.tool("logical_ports", () => {
 return new $ctl.application.Devicectl.LogicalPorts();
 });

 this.tool("physical_ports", () => {
 return new $ctl.application.Devicectl.PhysicalPorts();
 });

 this.tool("virtual_ports", () => {
 return new $ctl.application.Devicectl.VirtualPorts();
 });
Expand DownExpand Up@@ -89,9 +81,7 @@ $ctl.application.Devicectl = $tc.extend(

 $('#ports-tab').on('show.bs.tab', () => {
 $('[data-element=button_create_facility]').hide();
 $('[data-component=virtual_ports').appendTo($("#device-detail"));
 $('[data-component=logical_ports').appendTo($("#device-detail"));
 $('[data-component=physical_ports').appendTo($("#device-detail"));
 $('[data-component=virtual_ports').appendTo($("#allports"));
 });

 $('#tab-overview').on('show.bs.tab', () => {
Expand All@@ -101,9 +91,6 @@ $ctl.application.Devicectl = $tc.extend(
 $($ctl).trigger("init_tools", [this]);

 this.$t.devices.activate();
 this.$t.logical_ports.activate();
 this.$t.physical_ports.activate();
 this.$t.virtual_ports.activate();

 this.sync();

Expand DownExpand Up@@ -187,8 +174,6 @@ $ctl.application.Devicectl.DeviceSelect = $tc.extend(

 sync : function() {
 $ctl.devicectl.$t.virtual_ports.sync();
 $ctl.devicectl.$t.logical_ports.sync();
 $ctl.devicectl.$t.physical_ports.sync();
 $ctl.devicectl.$t.device.show_device(this.element.val());
 },

Expand DownExpand Up@@ -1391,6 +1376,10 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 if (!grainy.check(data.grainy, "d")) {
 button_delete.element.hide();
 }

 row.click(() =>{
 new $ctl.application.Devicectl.PortsViewInformation(data);
 });
 };

 this.$w.list.format_request_url = (url) => {
Expand DownExpand Up@@ -1444,6 +1433,88 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 $ctl.application.Tool
);

$ctl.application.Devicectl.PortsViewInformation = $tc.extend(
 "PortsViewInformation",
 {
 PortsViewInformation: function (data) {
 var title = "Virtual Ports - " + data.display_name;
 var element = $('<div>');

 var dataContent = `
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.display_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">VLAN ID</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.vlan_id}" readonly/>
 </div>

 <h5 class="modal-title">Logical Port - ${data.logical_port.name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Channel</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.channel}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Trunk</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.trunk}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.description}" readonly/>
 </div>

 <h5 class="modal-title">Physical Ports</h5>

 `;

 data.physical_ports.forEach(function(physical_port, index){
 dataContent += `
 <h5 class="modal-title">Physical Port - ${physical_port.display_name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Device</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.device_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.description}" readonly/>
 </div>
 `;
 })
 element.append(dataContent);

 this.Modal("no_button_lg", title, element);
 }
},
 $ctl.application.Modal
);

$ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 "ModalVirtualPort",
 {
Expand All@@ -1453,6 +1524,7 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 var form = this.form = new twentyc.rest.Form(
 $ctl.template("form_virtual_port")
 );
 var LogicalPortsList = [];

 var logical_port_select = this.logical_port_select = new twentyc.rest.Select(
 form.element.find('select[name="logical_port"]')
Expand All@@ -1465,14 +1537,141 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 logical_port_select.load().then(() => {
 if (virtual_port) { logical_port_select.element.val(virtual_port.logical_port) }
 });

 console.log(virtual_port)

 $.ajax({
 url: `/api/facility/digital_reality/${fullctl.devicectl.facility_slug()}/logical_ports/`,
 type: 'GET',
 success: function(response) {
 logical_ports_data = response.data
 response.data.forEach(function(data) {
 LogicalPortsList.push({
 logical_ports_name: data.display_name
 });
 });
 },
 error: function(xhr, status, error) {
 console.error(xhr.responseText);
 },
 async: false
 });
 // channel
 var logical_port_channel = form.element.find('input[name="logical_port_channel"]');
 if (virtual_port) { 
 logical_port_channel.val(virtual_port.logical_port.channel) 
 }

 // trunk
 var logical_port_trunk = form.element.find('input[name="logical_port_trunk"]')
 if (virtual_port) { 
 logical_port_trunk.val(virtual_port.logical_port.trunk) 
 }

 // description
 var logical_port_description = form.element.find('input[name="logical_port_description"]');
 if (virtual_port) { 
 logical_port_description.val(virtual_port.logical_port.description)
 }
 this.virtual_port = virtual_port;

 physical_ports = form.element.find('.physical-ports-container');

 // Creation of a Port
 if (!virtual_port) {
 var phyical_data_content = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name" />
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <span class="modal-control">
 <input type="text" class="form-control" id="device-name" name="physical_port_device_name" disabled />
 <input type="hidden" name="device" id="device">
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port" name="physical_logical_port">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description" />
 </div>
 </div>
 `
 physical_ports.append(phyical_data_content)
 var logical_ports_select = form.element.find('#physical_port-logical_port');
 logical_ports_select.append($('<option>').attr('value', '').text('Create matching logical port'));

 $.each(LogicalPortsList, function(index, logical_port) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 });
 }

 if (virtual_port) {
 title = "Edit " + virtual_port.display_name;
 title = "Edit Virtual Port" + virtual_port.display_name;
 form.method = "PUT"
 form.form_action = virtual_port.id;
 form.fill(virtual_port);

 virtual_port.physical_ports.forEach(function(port, index){
 var physicaldataContent = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Physical Port Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name_${index}" value="${port.display_name}"/>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <input type="text" class="form-control" name="physical_port_device_name_${index}" id="device" value="${port.device_name}" disabled>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port_${index}" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port_${index}" name="physical_logical_port_${index}">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description_${index}" value="${port.description}" />
 </div>
 </div>
 <hr style="border-color: #000; border-width: 2px;">
 `
 physical_ports.append(physicaldataContent)

 var logical_ports_select = form.element.find(`#physical_port-logical_port_${index}`);
 logical_ports_select.append($('<option>').attr('value', '').text(`${port.logical_port_name}`));

 $.each(LogicalPortsList, function(index, logical_port) {
 if (port.logical_port_name !== logical_port.logical_ports_name) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 }
 })
 });

 form.element.find('input[type="text"],select,input[type="checkbox"]').each(function () {
 if (!grainy.check(virtual_port.grainy + "." + $(this).attr("name"), "u")) {
Expand All@@ -1483,6 +1682,42 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(

 $(this.form).on("api-write:before", (ev, e, payload) => {
 payload["id"] = virtual_port.id;
 payload["physical_ports"] = []
 payload.logical_port_data = {
 channel: payload.logical_port_channel,
 description: payload.logical_port_description,
 name: payload.logical_port_name,
 trunk: payload.logical_port_trunk
 }
 delete payload.logical_port_channel;
 delete payload.logical_port_description;
 delete payload.logical_port_name;
 delete payload.logical_port_trunk;

 var count = 0;
 for (var key in payload) {
 // Check if the key starts with "physical"
 if (key.startsWith("physical")) {
 // Increment the count
 count++;
 }
 }
 iterate_times = count / 4

 for (var i = 0; i < iterate_times; i++) {
 payload.physical_ports.push({
 name: payload[`physical_port_name_${i}`],
 device_name: payload[`physical_port_device_name_${i}`],
 logical_port: payload[`physical_logical_port_${i}`],
 description: payload[`physical_port_description_${i}`],
 })

 delete payload[`physical_port_name_${i}`];
 delete payload[`physical_port_device_name_${i}`];
 delete payload[`physical_logical_port_${i}`];
 delete payload[`physical_port_description_${i}`];
 }

 });
 }

Expand Down
Empty file addedsrc/django_devicectl/static/devicectl/v2/ports/ports.js

View file


Open in desktop


Empty file.


3 changes: 0 additions & 3 deletions
src/django_devicectl/templates/devicectl/v2/base.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,9 +165,6 @@
 </div>
 <div class="device-container" style="display:none">
 {% include "devicectl/v2/tool/device/main.html" %}
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
 {% include "devicectl/v2/tool/logical_ports/main.html" %}
 {% include "devicectl/v2/tool/physical_ports/main.html" %}
 </div>
 </div>
</div>
Expand Down

8 changes: 8 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="history-tab" data-bs-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
 </li>
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="allports-tab" data-bs-toggle="tab" href="#allports" role="tab" aria-controls="allports" aria-selected="false">Ports</a>
 </li>

 </ul>

Expand DownExpand Up@@ -56,6 +59,10 @@
 <div class="tab-pane fade" id="history" role="tabpanel" data-element="config_history_container" aria-labelledby="history-tab">

 </div>
 <!-- Ports Tab -->
 <div class="tab-pane fade" id="allports" role="tabpanel" data-element="all_ports_container" aria-labelledby="allports-tab">

 </div>

 </div>

Expand All@@ -71,6 +78,7 @@
 {% include "devicectl/v2/tool/device/config-current.html" %}
 {% include "devicectl/v2/tool/device/config-reference.html" %}
 {% include "devicectl/v2/tool/device/reports.html" %}
 {% include "devicectl/v2/tool/device/ports.html" %}

 </div>
</div>

4 changes: 4 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/ports.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
{% load static i18n %}
<div data-template="all_ports" >
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
</div>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
(WIP)ft: DeviceCtl GUI refactor#86

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.

 Sign up for GitHub

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

 Open

Genza999
wants to merge
6
commits into

base:draft-pr-branch
Choose a base branch

from

 Open


(WIP)ft: DeviceCtl GUI refactor
#86
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8ed246c

ft: move ports view and create ports tab


Genza999 Apr 26, 2024
f1a8673

reset removed code


Genza999 Apr 26, 2024
34fcb3f

fix: resolve error onload


Genza999 Apr 29, 2024
55dd753

fix: refactor implementation to show virtualports table


Genza999 Apr 30, 2024
2f50a3e

ft: add model for ports information and refute click propagation from…


Genza999 May 1, 2024
26e8d3e

refactor: additon and edition of ports


Genza999 May 6, 2024

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


3 changes: 2 additions & 1 deletion
src/django_devicectl/rest/serializers/devicectl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,7 @@ def get_virtual_port_name(self, port):
@register
class VirtualPort(TagMixin, ModelSerializer):
 physical_ports = serializers.SerializerMethodField()
 logical_port = LogicalPort()
 device = serializers.SerializerMethodField()
 port = serializers.SerializerMethodField()
 tags = serializers.SerializerMethodField()
Expand All@@ -262,7 +263,7 @@ class Meta:
 ]

 def get_physical_ports(self, obj):
 return InlinePhysicalPort(obj.physical_ports.all(), many=True).data
 return PhysicalPort(obj.physical_ports.all(), many=True).data

 def get_device(self, obj):
 return obj.device.id
Expand Down

269 changes: 252 additions & 17 deletions
src/django_devicectl/static/devicectl/v2/devicectl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,14 +27,6 @@ $ctl.application.Devicectl = $tc.extend(
 return new $ctl.application.Devicectl.DeviceDetails();
 });

 this.tool("logical_ports", () => {
 return new $ctl.application.Devicectl.LogicalPorts();
 });

 this.tool("physical_ports", () => {
 return new $ctl.application.Devicectl.PhysicalPorts();
 });

 this.tool("virtual_ports", () => {
 return new $ctl.application.Devicectl.VirtualPorts();
 });
Expand DownExpand Up@@ -89,9 +81,7 @@ $ctl.application.Devicectl = $tc.extend(

 $('#ports-tab').on('show.bs.tab', () => {
 $('[data-element=button_create_facility]').hide();
 $('[data-component=virtual_ports').appendTo($("#device-detail"));
 $('[data-component=logical_ports').appendTo($("#device-detail"));
 $('[data-component=physical_ports').appendTo($("#device-detail"));
 $('[data-component=virtual_ports').appendTo($("#allports"));
 });

 $('#tab-overview').on('show.bs.tab', () => {
Expand All@@ -101,9 +91,6 @@ $ctl.application.Devicectl = $tc.extend(
 $($ctl).trigger("init_tools", [this]);

 this.$t.devices.activate();
 this.$t.logical_ports.activate();
 this.$t.physical_ports.activate();
 this.$t.virtual_ports.activate();

 this.sync();

Expand DownExpand Up@@ -187,8 +174,6 @@ $ctl.application.Devicectl.DeviceSelect = $tc.extend(

 sync : function() {
 $ctl.devicectl.$t.virtual_ports.sync();
 $ctl.devicectl.$t.logical_ports.sync();
 $ctl.devicectl.$t.physical_ports.sync();
 $ctl.devicectl.$t.device.show_device(this.element.val());
 },

Expand DownExpand Up@@ -1391,6 +1376,10 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 if (!grainy.check(data.grainy, "d")) {
 button_delete.element.hide();
 }

 row.click(() =>{
 new $ctl.application.Devicectl.PortsViewInformation(data);
 });
 };

 this.$w.list.format_request_url = (url) => {
Expand DownExpand Up@@ -1444,6 +1433,88 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 $ctl.application.Tool
);

$ctl.application.Devicectl.PortsViewInformation = $tc.extend(
 "PortsViewInformation",
 {
 PortsViewInformation: function (data) {
 var title = "Virtual Ports - " + data.display_name;
 var element = $('<div>');

 var dataContent = `
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.display_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">VLAN ID</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.vlan_id}" readonly/>
 </div>

 <h5 class="modal-title">Logical Port - ${data.logical_port.name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Channel</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.channel}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Trunk</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.trunk}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.description}" readonly/>
 </div>

 <h5 class="modal-title">Physical Ports</h5>

 `;

 data.physical_ports.forEach(function(physical_port, index){
 dataContent += `
 <h5 class="modal-title">Physical Port - ${physical_port.display_name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Device</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.device_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.description}" readonly/>
 </div>
 `;
 })
 element.append(dataContent);

 this.Modal("no_button_lg", title, element);
 }
},
 $ctl.application.Modal
);

$ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 "ModalVirtualPort",
 {
Expand All@@ -1453,6 +1524,7 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 var form = this.form = new twentyc.rest.Form(
 $ctl.template("form_virtual_port")
 );
 var LogicalPortsList = [];

 var logical_port_select = this.logical_port_select = new twentyc.rest.Select(
 form.element.find('select[name="logical_port"]')
Expand All@@ -1465,14 +1537,141 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 logical_port_select.load().then(() => {
 if (virtual_port) { logical_port_select.element.val(virtual_port.logical_port) }
 });

 console.log(virtual_port)

 $.ajax({
 url: `/api/facility/digital_reality/${fullctl.devicectl.facility_slug()}/logical_ports/`,
 type: 'GET',
 success: function(response) {
 logical_ports_data = response.data
 response.data.forEach(function(data) {
 LogicalPortsList.push({
 logical_ports_name: data.display_name
 });
 });
 },
 error: function(xhr, status, error) {
 console.error(xhr.responseText);
 },
 async: false
 });
 // channel
 var logical_port_channel = form.element.find('input[name="logical_port_channel"]');
 if (virtual_port) { 
 logical_port_channel.val(virtual_port.logical_port.channel) 
 }

 // trunk
 var logical_port_trunk = form.element.find('input[name="logical_port_trunk"]')
 if (virtual_port) { 
 logical_port_trunk.val(virtual_port.logical_port.trunk) 
 }

 // description
 var logical_port_description = form.element.find('input[name="logical_port_description"]');
 if (virtual_port) { 
 logical_port_description.val(virtual_port.logical_port.description)
 }
 this.virtual_port = virtual_port;

 physical_ports = form.element.find('.physical-ports-container');

 // Creation of a Port
 if (!virtual_port) {
 var phyical_data_content = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name" />
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <span class="modal-control">
 <input type="text" class="form-control" id="device-name" name="physical_port_device_name" disabled />
 <input type="hidden" name="device" id="device">
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port" name="physical_logical_port">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description" />
 </div>
 </div>
 `
 physical_ports.append(phyical_data_content)
 var logical_ports_select = form.element.find('#physical_port-logical_port');
 logical_ports_select.append($('<option>').attr('value', '').text('Create matching logical port'));

 $.each(LogicalPortsList, function(index, logical_port) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 });
 }

 if (virtual_port) {
 title = "Edit " + virtual_port.display_name;
 title = "Edit Virtual Port" + virtual_port.display_name;
 form.method = "PUT"
 form.form_action = virtual_port.id;
 form.fill(virtual_port);

 virtual_port.physical_ports.forEach(function(port, index){
 var physicaldataContent = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Physical Port Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name_${index}" value="${port.display_name}"/>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <input type="text" class="form-control" name="physical_port_device_name_${index}" id="device" value="${port.device_name}" disabled>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port_${index}" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port_${index}" name="physical_logical_port_${index}">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description_${index}" value="${port.description}" />
 </div>
 </div>
 <hr style="border-color: #000; border-width: 2px;">
 `
 physical_ports.append(physicaldataContent)

 var logical_ports_select = form.element.find(`#physical_port-logical_port_${index}`);
 logical_ports_select.append($('<option>').attr('value', '').text(`${port.logical_port_name}`));

 $.each(LogicalPortsList, function(index, logical_port) {
 if (port.logical_port_name !== logical_port.logical_ports_name) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 }
 })
 });

 form.element.find('input[type="text"],select,input[type="checkbox"]').each(function () {
 if (!grainy.check(virtual_port.grainy + "." + $(this).attr("name"), "u")) {
Expand All@@ -1483,6 +1682,42 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(

 $(this.form).on("api-write:before", (ev, e, payload) => {
 payload["id"] = virtual_port.id;
 payload["physical_ports"] = []
 payload.logical_port_data = {
 channel: payload.logical_port_channel,
 description: payload.logical_port_description,
 name: payload.logical_port_name,
 trunk: payload.logical_port_trunk
 }
 delete payload.logical_port_channel;
 delete payload.logical_port_description;
 delete payload.logical_port_name;
 delete payload.logical_port_trunk;

 var count = 0;
 for (var key in payload) {
 // Check if the key starts with "physical"
 if (key.startsWith("physical")) {
 // Increment the count
 count++;
 }
 }
 iterate_times = count / 4

 for (var i = 0; i < iterate_times; i++) {
 payload.physical_ports.push({
 name: payload[`physical_port_name_${i}`],
 device_name: payload[`physical_port_device_name_${i}`],
 logical_port: payload[`physical_logical_port_${i}`],
 description: payload[`physical_port_description_${i}`],
 })

 delete payload[`physical_port_name_${i}`];
 delete payload[`physical_port_device_name_${i}`];
 delete payload[`physical_logical_port_${i}`];
 delete payload[`physical_port_description_${i}`];
 }

 });
 }

Expand Down
Empty file addedsrc/django_devicectl/static/devicectl/v2/ports/ports.js

View file


Open in desktop


Empty file.


3 changes: 0 additions & 3 deletions
src/django_devicectl/templates/devicectl/v2/base.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,9 +165,6 @@
 </div>
 <div class="device-container" style="display:none">
 {% include "devicectl/v2/tool/device/main.html" %}
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
 {% include "devicectl/v2/tool/logical_ports/main.html" %}
 {% include "devicectl/v2/tool/physical_ports/main.html" %}
 </div>
 </div>
</div>
Expand Down

8 changes: 8 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="history-tab" data-bs-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
 </li>
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="allports-tab" data-bs-toggle="tab" href="#allports" role="tab" aria-controls="allports" aria-selected="false">Ports</a>
 </li>

 </ul>

Expand DownExpand Up@@ -56,6 +59,10 @@
 <div class="tab-pane fade" id="history" role="tabpanel" data-element="config_history_container" aria-labelledby="history-tab">

 </div>
 <!-- Ports Tab -->
 <div class="tab-pane fade" id="allports" role="tabpanel" data-element="all_ports_container" aria-labelledby="allports-tab">

 </div>

 </div>

Expand All@@ -71,6 +78,7 @@
 {% include "devicectl/v2/tool/device/config-current.html" %}
 {% include "devicectl/v2/tool/device/config-reference.html" %}
 {% include "devicectl/v2/tool/device/reports.html" %}
 {% include "devicectl/v2/tool/device/ports.html" %}

 </div>
</div>

4 changes: 4 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/ports.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
{% load static i18n %}
<div data-template="all_ports" >
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
</div>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
(WIP)ft: DeviceCtl GUI refactor#86

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.

 Sign up for GitHub

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

 Open

Genza999
wants to merge
6
commits into

base:draft-pr-branch
Choose a base branch

from

 Open


(WIP)ft: DeviceCtl GUI refactor
#86
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8ed246c

ft: move ports view and create ports tab


Genza999 Apr 26, 2024
f1a8673

reset removed code


Genza999 Apr 26, 2024
34fcb3f

fix: resolve error onload


Genza999 Apr 29, 2024
55dd753

fix: refactor implementation to show virtualports table


Genza999 Apr 30, 2024
2f50a3e

ft: add model for ports information and refute click propagation from…


Genza999 May 1, 2024
26e8d3e

refactor: additon and edition of ports


Genza999 May 6, 2024

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


3 changes: 2 additions & 1 deletion
src/django_devicectl/rest/serializers/devicectl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,7 @@ def get_virtual_port_name(self, port):
@register
class VirtualPort(TagMixin, ModelSerializer):
 physical_ports = serializers.SerializerMethodField()
 logical_port = LogicalPort()
 device = serializers.SerializerMethodField()
 port = serializers.SerializerMethodField()
 tags = serializers.SerializerMethodField()
Expand All@@ -262,7 +263,7 @@ class Meta:
 ]

 def get_physical_ports(self, obj):
 return InlinePhysicalPort(obj.physical_ports.all(), many=True).data
 return PhysicalPort(obj.physical_ports.all(), many=True).data

 def get_device(self, obj):
 return obj.device.id
Expand Down

269 changes: 252 additions & 17 deletions
src/django_devicectl/static/devicectl/v2/devicectl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,14 +27,6 @@ $ctl.application.Devicectl = $tc.extend(
 return new $ctl.application.Devicectl.DeviceDetails();
 });

 this.tool("logical_ports", () => {
 return new $ctl.application.Devicectl.LogicalPorts();
 });

 this.tool("physical_ports", () => {
 return new $ctl.application.Devicectl.PhysicalPorts();
 });

 this.tool("virtual_ports", () => {
 return new $ctl.application.Devicectl.VirtualPorts();
 });
Expand DownExpand Up@@ -89,9 +81,7 @@ $ctl.application.Devicectl = $tc.extend(

 $('#ports-tab').on('show.bs.tab', () => {
 $('[data-element=button_create_facility]').hide();
 $('[data-component=virtual_ports').appendTo($("#device-detail"));
 $('[data-component=logical_ports').appendTo($("#device-detail"));
 $('[data-component=physical_ports').appendTo($("#device-detail"));
 $('[data-component=virtual_ports').appendTo($("#allports"));
 });

 $('#tab-overview').on('show.bs.tab', () => {
Expand All@@ -101,9 +91,6 @@ $ctl.application.Devicectl = $tc.extend(
 $($ctl).trigger("init_tools", [this]);

 this.$t.devices.activate();
 this.$t.logical_ports.activate();
 this.$t.physical_ports.activate();
 this.$t.virtual_ports.activate();

 this.sync();

Expand DownExpand Up@@ -187,8 +174,6 @@ $ctl.application.Devicectl.DeviceSelect = $tc.extend(

 sync : function() {
 $ctl.devicectl.$t.virtual_ports.sync();
 $ctl.devicectl.$t.logical_ports.sync();
 $ctl.devicectl.$t.physical_ports.sync();
 $ctl.devicectl.$t.device.show_device(this.element.val());
 },

Expand DownExpand Up@@ -1391,6 +1376,10 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 if (!grainy.check(data.grainy, "d")) {
 button_delete.element.hide();
 }

 row.click(() =>{
 new $ctl.application.Devicectl.PortsViewInformation(data);
 });
 };

 this.$w.list.format_request_url = (url) => {
Expand DownExpand Up@@ -1444,6 +1433,88 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 $ctl.application.Tool
);

$ctl.application.Devicectl.PortsViewInformation = $tc.extend(
 "PortsViewInformation",
 {
 PortsViewInformation: function (data) {
 var title = "Virtual Ports - " + data.display_name;
 var element = $('<div>');

 var dataContent = `
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.display_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">VLAN ID</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.vlan_id}" readonly/>
 </div>

 <h5 class="modal-title">Logical Port - ${data.logical_port.name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Channel</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.channel}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Trunk</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.trunk}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.description}" readonly/>
 </div>

 <h5 class="modal-title">Physical Ports</h5>

 `;

 data.physical_ports.forEach(function(physical_port, index){
 dataContent += `
 <h5 class="modal-title">Physical Port - ${physical_port.display_name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Device</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.device_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.description}" readonly/>
 </div>
 `;
 })
 element.append(dataContent);

 this.Modal("no_button_lg", title, element);
 }
},
 $ctl.application.Modal
);

$ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 "ModalVirtualPort",
 {
Expand All@@ -1453,6 +1524,7 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 var form = this.form = new twentyc.rest.Form(
 $ctl.template("form_virtual_port")
 );
 var LogicalPortsList = [];

 var logical_port_select = this.logical_port_select = new twentyc.rest.Select(
 form.element.find('select[name="logical_port"]')
Expand All@@ -1465,14 +1537,141 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 logical_port_select.load().then(() => {
 if (virtual_port) { logical_port_select.element.val(virtual_port.logical_port) }
 });

 console.log(virtual_port)

 $.ajax({
 url: `/api/facility/digital_reality/${fullctl.devicectl.facility_slug()}/logical_ports/`,
 type: 'GET',
 success: function(response) {
 logical_ports_data = response.data
 response.data.forEach(function(data) {
 LogicalPortsList.push({
 logical_ports_name: data.display_name
 });
 });
 },
 error: function(xhr, status, error) {
 console.error(xhr.responseText);
 },
 async: false
 });
 // channel
 var logical_port_channel = form.element.find('input[name="logical_port_channel"]');
 if (virtual_port) { 
 logical_port_channel.val(virtual_port.logical_port.channel) 
 }

 // trunk
 var logical_port_trunk = form.element.find('input[name="logical_port_trunk"]')
 if (virtual_port) { 
 logical_port_trunk.val(virtual_port.logical_port.trunk) 
 }

 // description
 var logical_port_description = form.element.find('input[name="logical_port_description"]');
 if (virtual_port) { 
 logical_port_description.val(virtual_port.logical_port.description)
 }
 this.virtual_port = virtual_port;

 physical_ports = form.element.find('.physical-ports-container');

 // Creation of a Port
 if (!virtual_port) {
 var phyical_data_content = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name" />
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <span class="modal-control">
 <input type="text" class="form-control" id="device-name" name="physical_port_device_name" disabled />
 <input type="hidden" name="device" id="device">
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port" name="physical_logical_port">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description" />
 </div>
 </div>
 `
 physical_ports.append(phyical_data_content)
 var logical_ports_select = form.element.find('#physical_port-logical_port');
 logical_ports_select.append($('<option>').attr('value', '').text('Create matching logical port'));

 $.each(LogicalPortsList, function(index, logical_port) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 });
 }

 if (virtual_port) {
 title = "Edit " + virtual_port.display_name;
 title = "Edit Virtual Port" + virtual_port.display_name;
 form.method = "PUT"
 form.form_action = virtual_port.id;
 form.fill(virtual_port);

 virtual_port.physical_ports.forEach(function(port, index){
 var physicaldataContent = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Physical Port Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name_${index}" value="${port.display_name}"/>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <input type="text" class="form-control" name="physical_port_device_name_${index}" id="device" value="${port.device_name}" disabled>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port_${index}" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port_${index}" name="physical_logical_port_${index}">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description_${index}" value="${port.description}" />
 </div>
 </div>
 <hr style="border-color: #000; border-width: 2px;">
 `
 physical_ports.append(physicaldataContent)

 var logical_ports_select = form.element.find(`#physical_port-logical_port_${index}`);
 logical_ports_select.append($('<option>').attr('value', '').text(`${port.logical_port_name}`));

 $.each(LogicalPortsList, function(index, logical_port) {
 if (port.logical_port_name !== logical_port.logical_ports_name) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 }
 })
 });

 form.element.find('input[type="text"],select,input[type="checkbox"]').each(function () {
 if (!grainy.check(virtual_port.grainy + "." + $(this).attr("name"), "u")) {
Expand All@@ -1483,6 +1682,42 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(

 $(this.form).on("api-write:before", (ev, e, payload) => {
 payload["id"] = virtual_port.id;
 payload["physical_ports"] = []
 payload.logical_port_data = {
 channel: payload.logical_port_channel,
 description: payload.logical_port_description,
 name: payload.logical_port_name,
 trunk: payload.logical_port_trunk
 }
 delete payload.logical_port_channel;
 delete payload.logical_port_description;
 delete payload.logical_port_name;
 delete payload.logical_port_trunk;

 var count = 0;
 for (var key in payload) {
 // Check if the key starts with "physical"
 if (key.startsWith("physical")) {
 // Increment the count
 count++;
 }
 }
 iterate_times = count / 4

 for (var i = 0; i < iterate_times; i++) {
 payload.physical_ports.push({
 name: payload[`physical_port_name_${i}`],
 device_name: payload[`physical_port_device_name_${i}`],
 logical_port: payload[`physical_logical_port_${i}`],
 description: payload[`physical_port_description_${i}`],
 })

 delete payload[`physical_port_name_${i}`];
 delete payload[`physical_port_device_name_${i}`];
 delete payload[`physical_logical_port_${i}`];
 delete payload[`physical_port_description_${i}`];
 }

 });
 }

Expand Down
Empty file addedsrc/django_devicectl/static/devicectl/v2/ports/ports.js

View file


Open in desktop


Empty file.


3 changes: 0 additions & 3 deletions
src/django_devicectl/templates/devicectl/v2/base.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,9 +165,6 @@
 </div>
 <div class="device-container" style="display:none">
 {% include "devicectl/v2/tool/device/main.html" %}
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
 {% include "devicectl/v2/tool/logical_ports/main.html" %}
 {% include "devicectl/v2/tool/physical_ports/main.html" %}
 </div>
 </div>
</div>
Expand Down

8 changes: 8 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="history-tab" data-bs-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
 </li>
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="allports-tab" data-bs-toggle="tab" href="#allports" role="tab" aria-controls="allports" aria-selected="false">Ports</a>
 </li>

 </ul>

Expand DownExpand Up@@ -56,6 +59,10 @@
 <div class="tab-pane fade" id="history" role="tabpanel" data-element="config_history_container" aria-labelledby="history-tab">

 </div>
 <!-- Ports Tab -->
 <div class="tab-pane fade" id="allports" role="tabpanel" data-element="all_ports_container" aria-labelledby="allports-tab">

 </div>

 </div>

Expand All@@ -71,6 +78,7 @@
 {% include "devicectl/v2/tool/device/config-current.html" %}
 {% include "devicectl/v2/tool/device/config-reference.html" %}
 {% include "devicectl/v2/tool/device/reports.html" %}
 {% include "devicectl/v2/tool/device/ports.html" %}

 </div>
</div>

4 changes: 4 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/ports.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
{% load static i18n %}
<div data-template="all_ports" >
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
</div>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
(WIP)ft: DeviceCtl GUI refactor#86

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.

 Sign up for GitHub

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

 Open

Genza999
wants to merge
6
commits into

base:draft-pr-branch
Choose a base branch

from

 Open


(WIP)ft: DeviceCtl GUI refactor
#86
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8ed246c

ft: move ports view and create ports tab


Genza999 Apr 26, 2024
f1a8673

reset removed code


Genza999 Apr 26, 2024
34fcb3f

fix: resolve error onload


Genza999 Apr 29, 2024
55dd753

fix: refactor implementation to show virtualports table


Genza999 Apr 30, 2024
2f50a3e

ft: add model for ports information and refute click propagation from…


Genza999 May 1, 2024
26e8d3e

refactor: additon and edition of ports


Genza999 May 6, 2024

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


3 changes: 2 additions & 1 deletion
src/django_devicectl/rest/serializers/devicectl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,7 @@ def get_virtual_port_name(self, port):
@register
class VirtualPort(TagMixin, ModelSerializer):
 physical_ports = serializers.SerializerMethodField()
 logical_port = LogicalPort()
 device = serializers.SerializerMethodField()
 port = serializers.SerializerMethodField()
 tags = serializers.SerializerMethodField()
Expand All@@ -262,7 +263,7 @@ class Meta:
 ]

 def get_physical_ports(self, obj):
 return InlinePhysicalPort(obj.physical_ports.all(), many=True).data
 return PhysicalPort(obj.physical_ports.all(), many=True).data

 def get_device(self, obj):
 return obj.device.id
Expand Down

269 changes: 252 additions & 17 deletions
src/django_devicectl/static/devicectl/v2/devicectl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,14 +27,6 @@ $ctl.application.Devicectl = $tc.extend(
 return new $ctl.application.Devicectl.DeviceDetails();
 });

 this.tool("logical_ports", () => {
 return new $ctl.application.Devicectl.LogicalPorts();
 });

 this.tool("physical_ports", () => {
 return new $ctl.application.Devicectl.PhysicalPorts();
 });

 this.tool("virtual_ports", () => {
 return new $ctl.application.Devicectl.VirtualPorts();
 });
Expand DownExpand Up@@ -89,9 +81,7 @@ $ctl.application.Devicectl = $tc.extend(

 $('#ports-tab').on('show.bs.tab', () => {
 $('[data-element=button_create_facility]').hide();
 $('[data-component=virtual_ports').appendTo($("#device-detail"));
 $('[data-component=logical_ports').appendTo($("#device-detail"));
 $('[data-component=physical_ports').appendTo($("#device-detail"));
 $('[data-component=virtual_ports').appendTo($("#allports"));
 });

 $('#tab-overview').on('show.bs.tab', () => {
Expand All@@ -101,9 +91,6 @@ $ctl.application.Devicectl = $tc.extend(
 $($ctl).trigger("init_tools", [this]);

 this.$t.devices.activate();
 this.$t.logical_ports.activate();
 this.$t.physical_ports.activate();
 this.$t.virtual_ports.activate();

 this.sync();

Expand DownExpand Up@@ -187,8 +174,6 @@ $ctl.application.Devicectl.DeviceSelect = $tc.extend(

 sync : function() {
 $ctl.devicectl.$t.virtual_ports.sync();
 $ctl.devicectl.$t.logical_ports.sync();
 $ctl.devicectl.$t.physical_ports.sync();
 $ctl.devicectl.$t.device.show_device(this.element.val());
 },

Expand DownExpand Up@@ -1391,6 +1376,10 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 if (!grainy.check(data.grainy, "d")) {
 button_delete.element.hide();
 }

 row.click(() =>{
 new $ctl.application.Devicectl.PortsViewInformation(data);
 });
 };

 this.$w.list.format_request_url = (url) => {
Expand DownExpand Up@@ -1444,6 +1433,88 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 $ctl.application.Tool
);

$ctl.application.Devicectl.PortsViewInformation = $tc.extend(
 "PortsViewInformation",
 {
 PortsViewInformation: function (data) {
 var title = "Virtual Ports - " + data.display_name;
 var element = $('<div>');

 var dataContent = `
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.display_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">VLAN ID</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.vlan_id}" readonly/>
 </div>

 <h5 class="modal-title">Logical Port - ${data.logical_port.name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Channel</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.channel}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Trunk</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.trunk}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.description}" readonly/>
 </div>

 <h5 class="modal-title">Physical Ports</h5>

 `;

 data.physical_ports.forEach(function(physical_port, index){
 dataContent += `
 <h5 class="modal-title">Physical Port - ${physical_port.display_name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Device</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.device_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.description}" readonly/>
 </div>
 `;
 })
 element.append(dataContent);

 this.Modal("no_button_lg", title, element);
 }
},
 $ctl.application.Modal
);

$ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 "ModalVirtualPort",
 {
Expand All@@ -1453,6 +1524,7 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 var form = this.form = new twentyc.rest.Form(
 $ctl.template("form_virtual_port")
 );
 var LogicalPortsList = [];

 var logical_port_select = this.logical_port_select = new twentyc.rest.Select(
 form.element.find('select[name="logical_port"]')
Expand All@@ -1465,14 +1537,141 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 logical_port_select.load().then(() => {
 if (virtual_port) { logical_port_select.element.val(virtual_port.logical_port) }
 });

 console.log(virtual_port)

 $.ajax({
 url: `/api/facility/digital_reality/${fullctl.devicectl.facility_slug()}/logical_ports/`,
 type: 'GET',
 success: function(response) {
 logical_ports_data = response.data
 response.data.forEach(function(data) {
 LogicalPortsList.push({
 logical_ports_name: data.display_name
 });
 });
 },
 error: function(xhr, status, error) {
 console.error(xhr.responseText);
 },
 async: false
 });
 // channel
 var logical_port_channel = form.element.find('input[name="logical_port_channel"]');
 if (virtual_port) { 
 logical_port_channel.val(virtual_port.logical_port.channel) 
 }

 // trunk
 var logical_port_trunk = form.element.find('input[name="logical_port_trunk"]')
 if (virtual_port) { 
 logical_port_trunk.val(virtual_port.logical_port.trunk) 
 }

 // description
 var logical_port_description = form.element.find('input[name="logical_port_description"]');
 if (virtual_port) { 
 logical_port_description.val(virtual_port.logical_port.description)
 }
 this.virtual_port = virtual_port;

 physical_ports = form.element.find('.physical-ports-container');

 // Creation of a Port
 if (!virtual_port) {
 var phyical_data_content = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name" />
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <span class="modal-control">
 <input type="text" class="form-control" id="device-name" name="physical_port_device_name" disabled />
 <input type="hidden" name="device" id="device">
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port" name="physical_logical_port">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description" />
 </div>
 </div>
 `
 physical_ports.append(phyical_data_content)
 var logical_ports_select = form.element.find('#physical_port-logical_port');
 logical_ports_select.append($('<option>').attr('value', '').text('Create matching logical port'));

 $.each(LogicalPortsList, function(index, logical_port) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 });
 }

 if (virtual_port) {
 title = "Edit " + virtual_port.display_name;
 title = "Edit Virtual Port" + virtual_port.display_name;
 form.method = "PUT"
 form.form_action = virtual_port.id;
 form.fill(virtual_port);

 virtual_port.physical_ports.forEach(function(port, index){
 var physicaldataContent = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Physical Port Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name_${index}" value="${port.display_name}"/>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <input type="text" class="form-control" name="physical_port_device_name_${index}" id="device" value="${port.device_name}" disabled>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port_${index}" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port_${index}" name="physical_logical_port_${index}">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description_${index}" value="${port.description}" />
 </div>
 </div>
 <hr style="border-color: #000; border-width: 2px;">
 `
 physical_ports.append(physicaldataContent)

 var logical_ports_select = form.element.find(`#physical_port-logical_port_${index}`);
 logical_ports_select.append($('<option>').attr('value', '').text(`${port.logical_port_name}`));

 $.each(LogicalPortsList, function(index, logical_port) {
 if (port.logical_port_name !== logical_port.logical_ports_name) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 }
 })
 });

 form.element.find('input[type="text"],select,input[type="checkbox"]').each(function () {
 if (!grainy.check(virtual_port.grainy + "." + $(this).attr("name"), "u")) {
Expand All@@ -1483,6 +1682,42 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(

 $(this.form).on("api-write:before", (ev, e, payload) => {
 payload["id"] = virtual_port.id;
 payload["physical_ports"] = []
 payload.logical_port_data = {
 channel: payload.logical_port_channel,
 description: payload.logical_port_description,
 name: payload.logical_port_name,
 trunk: payload.logical_port_trunk
 }
 delete payload.logical_port_channel;
 delete payload.logical_port_description;
 delete payload.logical_port_name;
 delete payload.logical_port_trunk;

 var count = 0;
 for (var key in payload) {
 // Check if the key starts with "physical"
 if (key.startsWith("physical")) {
 // Increment the count
 count++;
 }
 }
 iterate_times = count / 4

 for (var i = 0; i < iterate_times; i++) {
 payload.physical_ports.push({
 name: payload[`physical_port_name_${i}`],
 device_name: payload[`physical_port_device_name_${i}`],
 logical_port: payload[`physical_logical_port_${i}`],
 description: payload[`physical_port_description_${i}`],
 })

 delete payload[`physical_port_name_${i}`];
 delete payload[`physical_port_device_name_${i}`];
 delete payload[`physical_logical_port_${i}`];
 delete payload[`physical_port_description_${i}`];
 }

 });
 }

Expand Down
Empty file addedsrc/django_devicectl/static/devicectl/v2/ports/ports.js

View file


Open in desktop


Empty file.


3 changes: 0 additions & 3 deletions
src/django_devicectl/templates/devicectl/v2/base.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,9 +165,6 @@
 </div>
 <div class="device-container" style="display:none">
 {% include "devicectl/v2/tool/device/main.html" %}
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
 {% include "devicectl/v2/tool/logical_ports/main.html" %}
 {% include "devicectl/v2/tool/physical_ports/main.html" %}
 </div>
 </div>
</div>
Expand Down

8 changes: 8 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="history-tab" data-bs-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
 </li>
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="allports-tab" data-bs-toggle="tab" href="#allports" role="tab" aria-controls="allports" aria-selected="false">Ports</a>
 </li>

 </ul>

Expand DownExpand Up@@ -56,6 +59,10 @@
 <div class="tab-pane fade" id="history" role="tabpanel" data-element="config_history_container" aria-labelledby="history-tab">

 </div>
 <!-- Ports Tab -->
 <div class="tab-pane fade" id="allports" role="tabpanel" data-element="all_ports_container" aria-labelledby="allports-tab">

 </div>

 </div>

Expand All@@ -71,6 +78,7 @@
 {% include "devicectl/v2/tool/device/config-current.html" %}
 {% include "devicectl/v2/tool/device/config-reference.html" %}
 {% include "devicectl/v2/tool/device/reports.html" %}
 {% include "devicectl/v2/tool/device/ports.html" %}

 </div>
</div>

4 changes: 4 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/ports.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
{% load static i18n %}
<div data-template="all_ports" >
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
</div>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
(WIP)ft: DeviceCtl GUI refactor#86

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.

 Sign up for GitHub

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

 Open

Genza999
wants to merge
6
commits into

base:draft-pr-branch
Choose a base branch

from

 Open


(WIP)ft: DeviceCtl GUI refactor
#86
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8ed246c

ft: move ports view and create ports tab


Genza999 Apr 26, 2024
f1a8673

reset removed code


Genza999 Apr 26, 2024
34fcb3f

fix: resolve error onload


Genza999 Apr 29, 2024
55dd753

fix: refactor implementation to show virtualports table


Genza999 Apr 30, 2024
2f50a3e

ft: add model for ports information and refute click propagation from…


Genza999 May 1, 2024
26e8d3e

refactor: additon and edition of ports


Genza999 May 6, 2024

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


3 changes: 2 additions & 1 deletion
src/django_devicectl/rest/serializers/devicectl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,7 @@ def get_virtual_port_name(self, port):
@register
class VirtualPort(TagMixin, ModelSerializer):
 physical_ports = serializers.SerializerMethodField()
 logical_port = LogicalPort()
 device = serializers.SerializerMethodField()
 port = serializers.SerializerMethodField()
 tags = serializers.SerializerMethodField()
Expand All@@ -262,7 +263,7 @@ class Meta:
 ]

 def get_physical_ports(self, obj):
 return InlinePhysicalPort(obj.physical_ports.all(), many=True).data
 return PhysicalPort(obj.physical_ports.all(), many=True).data

 def get_device(self, obj):
 return obj.device.id
Expand Down

269 changes: 252 additions & 17 deletions
src/django_devicectl/static/devicectl/v2/devicectl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,14 +27,6 @@ $ctl.application.Devicectl = $tc.extend(
 return new $ctl.application.Devicectl.DeviceDetails();
 });

 this.tool("logical_ports", () => {
 return new $ctl.application.Devicectl.LogicalPorts();
 });

 this.tool("physical_ports", () => {
 return new $ctl.application.Devicectl.PhysicalPorts();
 });

 this.tool("virtual_ports", () => {
 return new $ctl.application.Devicectl.VirtualPorts();
 });
Expand DownExpand Up@@ -89,9 +81,7 @@ $ctl.application.Devicectl = $tc.extend(

 $('#ports-tab').on('show.bs.tab', () => {
 $('[data-element=button_create_facility]').hide();
 $('[data-component=virtual_ports').appendTo($("#device-detail"));
 $('[data-component=logical_ports').appendTo($("#device-detail"));
 $('[data-component=physical_ports').appendTo($("#device-detail"));
 $('[data-component=virtual_ports').appendTo($("#allports"));
 });

 $('#tab-overview').on('show.bs.tab', () => {
Expand All@@ -101,9 +91,6 @@ $ctl.application.Devicectl = $tc.extend(
 $($ctl).trigger("init_tools", [this]);

 this.$t.devices.activate();
 this.$t.logical_ports.activate();
 this.$t.physical_ports.activate();
 this.$t.virtual_ports.activate();

 this.sync();

Expand DownExpand Up@@ -187,8 +174,6 @@ $ctl.application.Devicectl.DeviceSelect = $tc.extend(

 sync : function() {
 $ctl.devicectl.$t.virtual_ports.sync();
 $ctl.devicectl.$t.logical_ports.sync();
 $ctl.devicectl.$t.physical_ports.sync();
 $ctl.devicectl.$t.device.show_device(this.element.val());
 },

Expand DownExpand Up@@ -1391,6 +1376,10 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 if (!grainy.check(data.grainy, "d")) {
 button_delete.element.hide();
 }

 row.click(() =>{
 new $ctl.application.Devicectl.PortsViewInformation(data);
 });
 };

 this.$w.list.format_request_url = (url) => {
Expand DownExpand Up@@ -1444,6 +1433,88 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 $ctl.application.Tool
);

$ctl.application.Devicectl.PortsViewInformation = $tc.extend(
 "PortsViewInformation",
 {
 PortsViewInformation: function (data) {
 var title = "Virtual Ports - " + data.display_name;
 var element = $('<div>');

 var dataContent = `
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.display_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">VLAN ID</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.vlan_id}" readonly/>
 </div>

 <h5 class="modal-title">Logical Port - ${data.logical_port.name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Channel</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.channel}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Trunk</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.trunk}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.description}" readonly/>
 </div>

 <h5 class="modal-title">Physical Ports</h5>

 `;

 data.physical_ports.forEach(function(physical_port, index){
 dataContent += `
 <h5 class="modal-title">Physical Port - ${physical_port.display_name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Device</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.device_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.description}" readonly/>
 </div>
 `;
 })
 element.append(dataContent);

 this.Modal("no_button_lg", title, element);
 }
},
 $ctl.application.Modal
);

$ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 "ModalVirtualPort",
 {
Expand All@@ -1453,6 +1524,7 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 var form = this.form = new twentyc.rest.Form(
 $ctl.template("form_virtual_port")
 );
 var LogicalPortsList = [];

 var logical_port_select = this.logical_port_select = new twentyc.rest.Select(
 form.element.find('select[name="logical_port"]')
Expand All@@ -1465,14 +1537,141 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 logical_port_select.load().then(() => {
 if (virtual_port) { logical_port_select.element.val(virtual_port.logical_port) }
 });

 console.log(virtual_port)

 $.ajax({
 url: `/api/facility/digital_reality/${fullctl.devicectl.facility_slug()}/logical_ports/`,
 type: 'GET',
 success: function(response) {
 logical_ports_data = response.data
 response.data.forEach(function(data) {
 LogicalPortsList.push({
 logical_ports_name: data.display_name
 });
 });
 },
 error: function(xhr, status, error) {
 console.error(xhr.responseText);
 },
 async: false
 });
 // channel
 var logical_port_channel = form.element.find('input[name="logical_port_channel"]');
 if (virtual_port) { 
 logical_port_channel.val(virtual_port.logical_port.channel) 
 }

 // trunk
 var logical_port_trunk = form.element.find('input[name="logical_port_trunk"]')
 if (virtual_port) { 
 logical_port_trunk.val(virtual_port.logical_port.trunk) 
 }

 // description
 var logical_port_description = form.element.find('input[name="logical_port_description"]');
 if (virtual_port) { 
 logical_port_description.val(virtual_port.logical_port.description)
 }
 this.virtual_port = virtual_port;

 physical_ports = form.element.find('.physical-ports-container');

 // Creation of a Port
 if (!virtual_port) {
 var phyical_data_content = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name" />
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <span class="modal-control">
 <input type="text" class="form-control" id="device-name" name="physical_port_device_name" disabled />
 <input type="hidden" name="device" id="device">
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port" name="physical_logical_port">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description" />
 </div>
 </div>
 `
 physical_ports.append(phyical_data_content)
 var logical_ports_select = form.element.find('#physical_port-logical_port');
 logical_ports_select.append($('<option>').attr('value', '').text('Create matching logical port'));

 $.each(LogicalPortsList, function(index, logical_port) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 });
 }

 if (virtual_port) {
 title = "Edit " + virtual_port.display_name;
 title = "Edit Virtual Port" + virtual_port.display_name;
 form.method = "PUT"
 form.form_action = virtual_port.id;
 form.fill(virtual_port);

 virtual_port.physical_ports.forEach(function(port, index){
 var physicaldataContent = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Physical Port Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name_${index}" value="${port.display_name}"/>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <input type="text" class="form-control" name="physical_port_device_name_${index}" id="device" value="${port.device_name}" disabled>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port_${index}" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port_${index}" name="physical_logical_port_${index}">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description_${index}" value="${port.description}" />
 </div>
 </div>
 <hr style="border-color: #000; border-width: 2px;">
 `
 physical_ports.append(physicaldataContent)

 var logical_ports_select = form.element.find(`#physical_port-logical_port_${index}`);
 logical_ports_select.append($('<option>').attr('value', '').text(`${port.logical_port_name}`));

 $.each(LogicalPortsList, function(index, logical_port) {
 if (port.logical_port_name !== logical_port.logical_ports_name) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 }
 })
 });

 form.element.find('input[type="text"],select,input[type="checkbox"]').each(function () {
 if (!grainy.check(virtual_port.grainy + "." + $(this).attr("name"), "u")) {
Expand All@@ -1483,6 +1682,42 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(

 $(this.form).on("api-write:before", (ev, e, payload) => {
 payload["id"] = virtual_port.id;
 payload["physical_ports"] = []
 payload.logical_port_data = {
 channel: payload.logical_port_channel,
 description: payload.logical_port_description,
 name: payload.logical_port_name,
 trunk: payload.logical_port_trunk
 }
 delete payload.logical_port_channel;
 delete payload.logical_port_description;
 delete payload.logical_port_name;
 delete payload.logical_port_trunk;

 var count = 0;
 for (var key in payload) {
 // Check if the key starts with "physical"
 if (key.startsWith("physical")) {
 // Increment the count
 count++;
 }
 }
 iterate_times = count / 4

 for (var i = 0; i < iterate_times; i++) {
 payload.physical_ports.push({
 name: payload[`physical_port_name_${i}`],
 device_name: payload[`physical_port_device_name_${i}`],
 logical_port: payload[`physical_logical_port_${i}`],
 description: payload[`physical_port_description_${i}`],
 })

 delete payload[`physical_port_name_${i}`];
 delete payload[`physical_port_device_name_${i}`];
 delete payload[`physical_logical_port_${i}`];
 delete payload[`physical_port_description_${i}`];
 }

 });
 }

Expand Down
Empty file addedsrc/django_devicectl/static/devicectl/v2/ports/ports.js

View file


Open in desktop


Empty file.


3 changes: 0 additions & 3 deletions
src/django_devicectl/templates/devicectl/v2/base.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,9 +165,6 @@
 </div>
 <div class="device-container" style="display:none">
 {% include "devicectl/v2/tool/device/main.html" %}
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
 {% include "devicectl/v2/tool/logical_ports/main.html" %}
 {% include "devicectl/v2/tool/physical_ports/main.html" %}
 </div>
 </div>
</div>
Expand Down

8 changes: 8 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="history-tab" data-bs-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
 </li>
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="allports-tab" data-bs-toggle="tab" href="#allports" role="tab" aria-controls="allports" aria-selected="false">Ports</a>
 </li>

 </ul>

Expand DownExpand Up@@ -56,6 +59,10 @@
 <div class="tab-pane fade" id="history" role="tabpanel" data-element="config_history_container" aria-labelledby="history-tab">

 </div>
 <!-- Ports Tab -->
 <div class="tab-pane fade" id="allports" role="tabpanel" data-element="all_ports_container" aria-labelledby="allports-tab">

 </div>

 </div>

Expand All@@ -71,6 +78,7 @@
 {% include "devicectl/v2/tool/device/config-current.html" %}
 {% include "devicectl/v2/tool/device/config-reference.html" %}
 {% include "devicectl/v2/tool/device/reports.html" %}
 {% include "devicectl/v2/tool/device/ports.html" %}

 </div>
</div>

4 changes: 4 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/ports.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
{% load static i18n %}
<div data-template="all_ports" >
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
</div>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
(WIP)ft: DeviceCtl GUI refactor#86

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.

 Sign up for GitHub

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

 Open

Genza999
wants to merge
6
commits into

base:draft-pr-branch
Choose a base branch

from

 Open


(WIP)ft: DeviceCtl GUI refactor
#86
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8ed246c

ft: move ports view and create ports tab


Genza999 Apr 26, 2024
f1a8673

reset removed code


Genza999 Apr 26, 2024
34fcb3f

fix: resolve error onload


Genza999 Apr 29, 2024
55dd753

fix: refactor implementation to show virtualports table


Genza999 Apr 30, 2024
2f50a3e

ft: add model for ports information and refute click propagation from…


Genza999 May 1, 2024
26e8d3e

refactor: additon and edition of ports


Genza999 May 6, 2024

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


3 changes: 2 additions & 1 deletion
src/django_devicectl/rest/serializers/devicectl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,7 @@ def get_virtual_port_name(self, port):
@register
class VirtualPort(TagMixin, ModelSerializer):
 physical_ports = serializers.SerializerMethodField()
 logical_port = LogicalPort()
 device = serializers.SerializerMethodField()
 port = serializers.SerializerMethodField()
 tags = serializers.SerializerMethodField()
Expand All@@ -262,7 +263,7 @@ class Meta:
 ]

 def get_physical_ports(self, obj):
 return InlinePhysicalPort(obj.physical_ports.all(), many=True).data
 return PhysicalPort(obj.physical_ports.all(), many=True).data

 def get_device(self, obj):
 return obj.device.id
Expand Down

269 changes: 252 additions & 17 deletions
src/django_devicectl/static/devicectl/v2/devicectl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,14 +27,6 @@ $ctl.application.Devicectl = $tc.extend(
 return new $ctl.application.Devicectl.DeviceDetails();
 });

 this.tool("logical_ports", () => {
 return new $ctl.application.Devicectl.LogicalPorts();
 });

 this.tool("physical_ports", () => {
 return new $ctl.application.Devicectl.PhysicalPorts();
 });

 this.tool("virtual_ports", () => {
 return new $ctl.application.Devicectl.VirtualPorts();
 });
Expand DownExpand Up@@ -89,9 +81,7 @@ $ctl.application.Devicectl = $tc.extend(

 $('#ports-tab').on('show.bs.tab', () => {
 $('[data-element=button_create_facility]').hide();
 $('[data-component=virtual_ports').appendTo($("#device-detail"));
 $('[data-component=logical_ports').appendTo($("#device-detail"));
 $('[data-component=physical_ports').appendTo($("#device-detail"));
 $('[data-component=virtual_ports').appendTo($("#allports"));
 });

 $('#tab-overview').on('show.bs.tab', () => {
Expand All@@ -101,9 +91,6 @@ $ctl.application.Devicectl = $tc.extend(
 $($ctl).trigger("init_tools", [this]);

 this.$t.devices.activate();
 this.$t.logical_ports.activate();
 this.$t.physical_ports.activate();
 this.$t.virtual_ports.activate();

 this.sync();

Expand DownExpand Up@@ -187,8 +174,6 @@ $ctl.application.Devicectl.DeviceSelect = $tc.extend(

 sync : function() {
 $ctl.devicectl.$t.virtual_ports.sync();
 $ctl.devicectl.$t.logical_ports.sync();
 $ctl.devicectl.$t.physical_ports.sync();
 $ctl.devicectl.$t.device.show_device(this.element.val());
 },

Expand DownExpand Up@@ -1391,6 +1376,10 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 if (!grainy.check(data.grainy, "d")) {
 button_delete.element.hide();
 }

 row.click(() =>{
 new $ctl.application.Devicectl.PortsViewInformation(data);
 });
 };

 this.$w.list.format_request_url = (url) => {
Expand DownExpand Up@@ -1444,6 +1433,88 @@ $ctl.application.Devicectl.VirtualPorts = $tc.extend(
 $ctl.application.Tool
);

$ctl.application.Devicectl.PortsViewInformation = $tc.extend(
 "PortsViewInformation",
 {
 PortsViewInformation: function (data) {
 var title = "Virtual Ports - " + data.display_name;
 var element = $('<div>');

 var dataContent = `
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.display_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">VLAN ID</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.vlan_id}" readonly/>
 </div>

 <h5 class="modal-title">Logical Port - ${data.logical_port.name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Channel</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.channel}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Trunk</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.trunk}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${data.logical_port.description}" readonly/>
 </div>

 <h5 class="modal-title">Physical Ports</h5>

 `;

 data.physical_ports.forEach(function(physical_port, index){
 dataContent += `
 <h5 class="modal-title">Physical Port - ${physical_port.display_name}</h5>
 <br>
 <div class="row mb-3">
 <label class="form-label">Name</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Device</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.device_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Logical Port</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.logical_port_name}" readonly/>
 </div>

 <div class="row mb-3">
 <label class="form-label">Description</label>
 <input type="text" style="background-color: var(--bs-body-bg);" value="${physical_port.description}" readonly/>
 </div>
 `;
 })
 element.append(dataContent);

 this.Modal("no_button_lg", title, element);
 }
},
 $ctl.application.Modal
);

$ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 "ModalVirtualPort",
 {
Expand All@@ -1453,6 +1524,7 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 var form = this.form = new twentyc.rest.Form(
 $ctl.template("form_virtual_port")
 );
 var LogicalPortsList = [];

 var logical_port_select = this.logical_port_select = new twentyc.rest.Select(
 form.element.find('select[name="logical_port"]')
Expand All@@ -1465,14 +1537,141 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(
 logical_port_select.load().then(() => {
 if (virtual_port) { logical_port_select.element.val(virtual_port.logical_port) }
 });

 console.log(virtual_port)

 $.ajax({
 url: `/api/facility/digital_reality/${fullctl.devicectl.facility_slug()}/logical_ports/`,
 type: 'GET',
 success: function(response) {
 logical_ports_data = response.data
 response.data.forEach(function(data) {
 LogicalPortsList.push({
 logical_ports_name: data.display_name
 });
 });
 },
 error: function(xhr, status, error) {
 console.error(xhr.responseText);
 },
 async: false
 });
 // channel
 var logical_port_channel = form.element.find('input[name="logical_port_channel"]');
 if (virtual_port) { 
 logical_port_channel.val(virtual_port.logical_port.channel) 
 }

 // trunk
 var logical_port_trunk = form.element.find('input[name="logical_port_trunk"]')
 if (virtual_port) { 
 logical_port_trunk.val(virtual_port.logical_port.trunk) 
 }

 // description
 var logical_port_description = form.element.find('input[name="logical_port_description"]');
 if (virtual_port) { 
 logical_port_description.val(virtual_port.logical_port.description)
 }
 this.virtual_port = virtual_port;

 physical_ports = form.element.find('.physical-ports-container');

 // Creation of a Port
 if (!virtual_port) {
 var phyical_data_content = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name" />
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <span class="modal-control">
 <input type="text" class="form-control" id="device-name" name="physical_port_device_name" disabled />
 <input type="hidden" name="device" id="device">
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port" name="physical_logical_port">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description" />
 </div>
 </div>
 `
 physical_ports.append(phyical_data_content)
 var logical_ports_select = form.element.find('#physical_port-logical_port');
 logical_ports_select.append($('<option>').attr('value', '').text('Create matching logical port'));

 $.each(LogicalPortsList, function(index, logical_port) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 });
 }

 if (virtual_port) {
 title = "Edit " + virtual_port.display_name;
 title = "Edit Virtual Port" + virtual_port.display_name;
 form.method = "PUT"
 form.form_action = virtual_port.id;
 form.fill(virtual_port);

 virtual_port.physical_ports.forEach(function(port, index){
 var physicaldataContent = `
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-name" class="form-label">Physical Port Name</label>
 <input type="text" class="form-control" id="physical_port-name" name="physical_port_name_${index}" value="${port.display_name}"/>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-device" class="form-label">Device</label>
 <input type="text" class="form-control" name="physical_port_device_name_${index}" id="device" value="${port.device_name}" disabled>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-logical_port_${index}" class="form-label">Logical Port</label>
 <span class="modal-control">
 <select 
 data-api-action="" class="form-control" id="physical_port-logical_port_${index}" name="physical_logical_port_${index}">
 <select>
 </span>
 </div>
 </div>
 <div class="row mb-3">
 <div class="col-12" data-api-submit="yes">
 <label for="physical_port-description" class="form-label">Description</label>
 <input type="text" class="form-control" id="physical_port-description" name="physical_port_description_${index}" value="${port.description}" />
 </div>
 </div>
 <hr style="border-color: #000; border-width: 2px;">
 `
 physical_ports.append(physicaldataContent)

 var logical_ports_select = form.element.find(`#physical_port-logical_port_${index}`);
 logical_ports_select.append($('<option>').attr('value', '').text(`${port.logical_port_name}`));

 $.each(LogicalPortsList, function(index, logical_port) {
 if (port.logical_port_name !== logical_port.logical_ports_name) {
 var option = $('<option>').attr('value', logical_port.logical_ports_name).text(logical_port.logical_ports_name);
 logical_ports_select.append(option);
 }
 })
 });

 form.element.find('input[type="text"],select,input[type="checkbox"]').each(function () {
 if (!grainy.check(virtual_port.grainy + "." + $(this).attr("name"), "u")) {
Expand All@@ -1483,6 +1682,42 @@ $ctl.application.Devicectl.ModalVirtualPort = $tc.extend(

 $(this.form).on("api-write:before", (ev, e, payload) => {
 payload["id"] = virtual_port.id;
 payload["physical_ports"] = []
 payload.logical_port_data = {
 channel: payload.logical_port_channel,
 description: payload.logical_port_description,
 name: payload.logical_port_name,
 trunk: payload.logical_port_trunk
 }
 delete payload.logical_port_channel;
 delete payload.logical_port_description;
 delete payload.logical_port_name;
 delete payload.logical_port_trunk;

 var count = 0;
 for (var key in payload) {
 // Check if the key starts with "physical"
 if (key.startsWith("physical")) {
 // Increment the count
 count++;
 }
 }
 iterate_times = count / 4

 for (var i = 0; i < iterate_times; i++) {
 payload.physical_ports.push({
 name: payload[`physical_port_name_${i}`],
 device_name: payload[`physical_port_device_name_${i}`],
 logical_port: payload[`physical_logical_port_${i}`],
 description: payload[`physical_port_description_${i}`],
 })

 delete payload[`physical_port_name_${i}`];
 delete payload[`physical_port_device_name_${i}`];
 delete payload[`physical_logical_port_${i}`];
 delete payload[`physical_port_description_${i}`];
 }

 });
 }

Expand Down
Empty file addedsrc/django_devicectl/static/devicectl/v2/ports/ports.js

View file


Open in desktop


Empty file.


3 changes: 0 additions & 3 deletions
src/django_devicectl/templates/devicectl/v2/base.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,9 +165,6 @@
 </div>
 <div class="device-container" style="display:none">
 {% include "devicectl/v2/tool/device/main.html" %}
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
 {% include "devicectl/v2/tool/logical_ports/main.html" %}
 {% include "devicectl/v2/tool/physical_ports/main.html" %}
 </div>
 </div>
</div>
Expand Down

8 changes: 8 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="history-tab" data-bs-toggle="tab" href="#history" role="tab" aria-controls="history" aria-selected="false">History</a>
 </li>
 <li class="nav-item" role="presentation">
 <a class="nav-link" id="allports-tab" data-bs-toggle="tab" href="#allports" role="tab" aria-controls="allports" aria-selected="false">Ports</a>
 </li>

 </ul>

Expand DownExpand Up@@ -56,6 +59,10 @@
 <div class="tab-pane fade" id="history" role="tabpanel" data-element="config_history_container" aria-labelledby="history-tab">

 </div>
 <!-- Ports Tab -->
 <div class="tab-pane fade" id="allports" role="tabpanel" data-element="all_ports_container" aria-labelledby="allports-tab">

 </div>

 </div>

Expand All@@ -71,6 +78,7 @@
 {% include "devicectl/v2/tool/device/config-current.html" %}
 {% include "devicectl/v2/tool/device/config-reference.html" %}
 {% include "devicectl/v2/tool/device/reports.html" %}
 {% include "devicectl/v2/tool/device/ports.html" %}

 </div>
</div>

4 changes: 4 additions & 0 deletions
src/django_devicectl/templates/devicectl/v2/tool/device/ports.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
{% load static i18n %}
<div data-template="all_ports" >
 {% include "devicectl/v2/tool/virtual_ports/main.html" %}
</div>
Loading