Merge pull request #226 from D10S0VSkY-OSS/hotfix/schedule-edit

Hotfix/schedule edit
D10S0VSkY-OSS · Dec 28, 2023 · 0fa9030 · 0fa9030
2 parents b90ce40 + 949b28f
commit 0fa9030
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 22 deletions.
diff --git a/play-with-sld/kubernetes/k8s/sld-dashboard.yml b/play-with-sld/kubernetes/k8s/sld-dashboard.yml
@@ -17,7 +17,7 @@ spec:
       subdomain: primary
       containers:
         - name: sld-dashboard
-          image: d10s0vsky/sld-dashboard:v3.4.0
+          image: d10s0vsky/sld-dashboard:v3.4.1
           env:
           - name: PATH
             value: "/home/sld/.asdf/shims:/home/sld/.asdf/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

diff --git a/sld-dashboard/app/base/static/assets/js/pagination.js b/sld-dashboard/app/base/static/assets/js/pagination.js
@@ -29,10 +29,6 @@ $(document).ready(function(){
       displayPage(1);
   }
 
-  // Event Delegation for edit buttons and other interactive elements
-  $(document).on('click', '.edit-button', function() {
-      // Aquí iría el código para manejar la edición
-  });
 
   // Existing search functionality
   $("#myInput").on("keyup", function() {

diff --git a/sld-dashboard/app/home/routes.py b/sld-dashboard/app/home/routes.py
@@ -1325,8 +1325,6 @@ def list_activity(limit):
 
 
 # Users
-
-
 @blueprint.route("/users-new", methods=["GET", "POST"])
 @login_required
 def new_user():
@@ -1580,7 +1578,7 @@ def delete_aws_account(aws_account_id):
 
         if response.get("status_code") == 200:
             flash(
-                f"Account Deleted"
+                "Account Deleted"
             )
         elif response.get("status_code") == 409:
             flash(response["json"].get("detail"), "error")

diff --git a/sld-dashboard/app/home/templates/aws-list.html b/sld-dashboard/app/home/templates/aws-list.html
@@ -134,14 +134,14 @@ <h2 class="h4">All aws accounts</h2>
             <div class="font-weight-bold small"><b></b><b></b></div>
         </div>
     </div>
- <!-- Pagination -->
+ <!-- Pagination
 <nav>
   <ul class="pagination">
     <li class="page-item" id="previous-page"><a class="page-link" href="#">Previous</a></li>
-    <!-- Page numbers will be dynamically inserted here -->
     <li class="page-item" id="next-page"><a class="page-link" href="#">Next</a></li>
   </ul>
-</nav>
+</nav> 
+-->
     {% include 'includes/footer.html' %}
 
 </main>
@@ -150,6 +150,6 @@ <h2 class="h4">All aws accounts</h2>
 
 <!-- Specific Page JS goes HERE  -->
 {% block javascripts %}
-<script src="/static/assets/js/pagination.js"></script>
+<!-- <script src="/static/assets/js/pagination.js"></script> -->
 {% endblock javascripts %}
 
diff --git a/sld-dashboard/app/home/templates/azure-list.html b/sld-dashboard/app/home/templates/azure-list.html
@@ -130,14 +130,14 @@ <h2 class="h4">All azure accounts</h2>
             <div class="font-weight-bold small"><b></b><b></b></div>
         </div>
     </div>
- <!-- Pagination -->
+ <!-- Pagination
 <nav>
   <ul class="pagination">
     <li class="page-item" id="previous-page"><a class="page-link" href="#">Previous</a></li>
-    <!-- Page numbers will be dynamically inserted here -->
     <li class="page-item" id="next-page"><a class="page-link" href="#">Next</a></li>
   </ul>
 </nav>
+-->
     {% include 'includes/footer.html' %}
 
 </main>
@@ -146,5 +146,5 @@ <h2 class="h4">All azure accounts</h2>
 
 <!-- Specific Page JS goes HERE  -->
 {% block javascripts %}
-<script src="/static/assets/js/pagination.js"></script>
+<!-- <script src="/static/assets/js/pagination.js"></script> -->
 {% endblock javascripts %}
diff --git a/sld-dashboard/app/home/templates/custom-provider-list.html b/sld-dashboard/app/home/templates/custom-provider-list.html
@@ -126,14 +126,14 @@ <h2 class="h4">All custom providers accounts</h2>
             <div class="font-weight-bold small"><b></b> <b></b></div>
         </div>
     </div>
-<!-- Pagination -->
+<!-- Pagination 
 <nav>
   <ul class="pagination">
     <li class="page-item" id="previous-page"><a class="page-link" href="#">Previous</a></li>
-    <!-- Page numbers will be dynamically inserted here -->
     <li class="page-item" id="next-page"><a class="page-link" href="#">Next</a></li>
   </ul>
 </nav>
+-->
 
     {% include 'includes/footer.html' %}
 
@@ -143,5 +143,5 @@ <h2 class="h4">All custom providers accounts</h2>
 
 <!-- Specific Page JS goes HERE  -->
 {% block javascripts %}
-<script src="/static/assets/js/pagination.js"></script>
+<!-- <script src="/static/assets/js/pagination.js"></script> -->
 {% endblock javascripts %}
diff --git a/sld-dashboard/app/home/templates/deploys-list.html b/sld-dashboard/app/home/templates/deploys-list.html
@@ -216,7 +216,7 @@ <h2 class="h4">All Deploys</h2>
                         </td>
                         <td>
                             <div>
-                            <span style="font-size: 12px; font-weight: bold;">Start:</span>
+                            <span style="font-size: 12px; font-weight: bold;">Apply:</span>
                             <span class="font-weight-bold">{{ deploy.start_time }}</span>
                             </div>
                             <div>
@@ -260,6 +260,10 @@ <h2 class="h4">All Deploys</h2>
                                             <span class="fas fa-clone mr-2"></span>
                                             Clone 
                                         </a>
+                                        <a title="Edit Schedule" class="dropdown-item" href="{{ url_for('.edit_schedule',deploy_id=deploy.id)}}">
+                                            <span class="far fa-clock mr-0"></span>
+                                            Schedule
+                                        </a>
                                         <a class="dropdown-item text-danger" data-toggle="modal" data-target="#DestroyModalCenter-{{deploy.id}}">
                                             <span class="fas fa-trash-alt mr-2"></span>
                                             Destroy

diff --git a/sld-dashboard/app/home/templates/gcp-list.html b/sld-dashboard/app/home/templates/gcp-list.html
@@ -126,14 +126,14 @@ <h2 class="h4">All gcp accounts</h2>
             <div class="font-weight-bold small"><b></b> <b></b></div>
         </div>
     </div>
- <!-- Pagination -->
+ <!-- Pagination
 <nav>
   <ul class="pagination">
     <li class="page-item" id="previous-page"><a class="page-link" href="#">Previous</a></li>
-    <!-- Page numbers will be dynamically inserted here -->
     <li class="page-item" id="next-page"><a class="page-link" href="#">Next</a></li>
   </ul>
 </nav>
+-->
     {% include 'includes/footer.html' %}
 
 </main>
@@ -142,5 +142,5 @@ <h2 class="h4">All gcp accounts</h2>
 
 <!-- Specific Page JS goes HERE  -->
 {% block javascripts %}
-<script src="/static/assets/js/pagination.js"></script>
+<!-- <script src="/static/assets/js/pagination.js"></script> -->
 {% endblock javascripts %}