Merge pull request #1185 from bunkerity/dev

Fix issue on the web UI were all services were being deleted
bunkerity · May 15, 2024 · 4a6aac6 · 4a6aac6
2 parents 9d63794 + dd1d6d4
commit 4a6aac6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -35,12 +35,12 @@ jobs:
           python -m pip install --no-cache-dir --require-hashes -r src/common/db/requirements.txt
           echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
+        uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql.yml
           setup-python-dependencies: false
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
+        uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -25,6 +25,6 @@ jobs:
           results_format: sarif
           publish_results: true
       - name: "Upload SARIF results to code scanning"
-        uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
+        uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
           sarif_file: results.sarif
diff --git a/src/ui/static/js/services.js b/src/ui/static/js/services.js
@@ -235,8 +235,8 @@ class ServiceModal {
     this.setCardViewportHeight(action === "delete" ? false : true);
     this.setHeaderActionsVisible(action === "delete" ? false : true);
     this.SetSelectTabsVisible(action === "delete" ? false : true);
-    this.resetFilterSettings();
     if (action === "edit" || action === "new" || action === "clone") {
+      this.resetFilterSettings();
       this.formNewEdit.classList.remove("hidden");
 
       const oldNameValue = action === "edit" ? oldServName : "";