Merge branch 'main' of https://github.com/devtron-labs/dashboard into…

… feat/swap-traffic
devtron-labs · Jan 2, 2025 · 724c2f6 · 724c2f6
2 parents fe3e348 + d5be6cc
commit 724c2f6
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 19 deletions.
diff --git a/.env b/.env
@@ -54,7 +54,6 @@ FEATURE_EXTERNAL_FLUX_CD_ENABLE=false
 FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE=false
 HIDE_NETWORK_STATUS_INTERFACE=true
 SYSTEM_CONTROLLER_LISTING_TIMEOUT=300000
-FEATURE_STEP_WISE_LOGS_ENABLE=true
 FEATURE_IMAGE_PROMOTION_ENABLE=false
 FEATURE_CD_MANDATORY_PLUGINS_ENABLE=true
 FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS=false

diff --git a/.github/semantic.yml b/.github/semantic.yml
@@ -11,3 +11,4 @@ types:
   - doc
   - release
   - misc
+  - sync
diff --git a/.github/workflows/pr-issue-validator.yaml b/.github/workflows/pr-issue-validator.yaml
@@ -34,7 +34,7 @@ jobs:
       run: |
         set -x    
         # Skip validation for documentation or chore PRs
-        if [[ "$TITLE" =~ ^(doc:|docs:|chore:|misc:|release:) ]]; then
+        if [[ "$TITLE" =~ ^(doc:|docs:|chore:|misc:|release:|sync:) ]]; then
           echo "Skipping validation for docs/chore PR."
           echo "PR NUMBER-: $PRNUM "
           gh pr edit $PRNUM --remove-label "PR:Issue-verification-failed"
@@ -106,21 +106,31 @@ jobs:
             --header "authorization: Bearer ${{ secrets.GH_PR_VALIDATOR_TOKEN }}" \
             "$issue_api_url" | jq '.state'|tr -d \")
           # Check if the issue is still open.
-          if [[ "$issue_status" == open ]]; then
-            echo "Issue #$issue_num is opened."
+          # if [[ "$issue_status" == open ]]; then
+            # echo "Issue #$issue_num is opened."
+            if [[ $forked == true ]]; then
+              echo "PR:Ready-to-Review, exiting gracefully"
+              exit 0
+            fi
             # Remove the 'Issue-verification-failed' label (if present) and add 'Ready-to-Review'.
             gh pr edit $PRNUM --remove-label "PR:Issue-verification-failed"
             gh pr edit $PRNUM --add-label "PR:Ready-to-Review"
-          else
-            echo "Issue #$issue_num is closed. Please link an open issue to proceed."
+            echo "PR:Ready-to-Review, exiting gracefully"
+            exit 0
+          # else
+            # echo "Issue #$issue_num is closed. Please link an open issue to proceed."
+              # if [[ $forked == true ]]; then
+                # echo "PR:Ready-to-Review, exiting gracefully"
+                # exit 0
+              # fi
             # Add a comment to the PR indicating the issue is not linked correctly.
-            gh pr comment $PRNUM --body "PR is  linked to a closed issue. Please link an open issue to proceed."
+            # gh pr comment $PRNUM --body "PR is  linked to a closed issue. Please link an open issue to proceed."
 
             # Add the 'Issue-verification-failed' label and remove 'Ready-to-Review'.
-            gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
-            gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
-            exit 1
-          fi
+            # gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
+            # gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
+            # exit 1
+          #fi
         else
           echo "Issue not found. Invalid URL or issue number."
           # Add a comment to the PR indicating the issue is not linked correctly.
@@ -130,4 +140,4 @@ jobs:
           gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
           gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
           exit 1
-        fi
+        fi
diff --git a/config.md b/config.md
@@ -48,7 +48,6 @@
 | SIDEBAR_DT_LOGO                              | ""         | Devtron logo for sidebar (would work if ORGANIZATION_NAME is not given)                                          |
 | SERVICE_WORKER_TIMEOUT                       | "1"        | Timeout value (in minutes) to fetch update for dashboard, change it cautiously as might hamper your update cycle |
 | TRIGGER_API_TIMEOUT                          | 60000      | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD                   |
-| FEATURE_STEP_WISE_LOGS_ENABLE                      | true         | Would segregate logs into tasks     |
 | FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS | "true" | Would hide the user direct permissions for non-super admin users in User Permissions |
 
 # DASHBOARD CONFIG SECRET
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.3.0-patch-3-beta-1",
+        "@devtron-labs/devtron-fe-common-lib": "1.3.0-patch-4-beta-1",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

diff --git a/src/css/base.scss b/src/css/base.scss
@@ -5287,3 +5287,9 @@ textarea::placeholder {
     z-index: var(--modal-index);
     backdrop-filter: blur(1px);
 }
+
+.dc__unset-pre {
+    background: inherit;
+    border: none;
+    padding: inherit;
+}
diff --git a/src/index.tsx b/src/index.tsx
@@ -156,7 +156,6 @@ if (!window || !window._env_) {
         FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE: false,
         HIDE_NETWORK_STATUS_INTERFACE: true,
         SYSTEM_CONTROLLER_LISTING_TIMEOUT: 60000 * 5,
-        FEATURE_STEP_WISE_LOGS_ENABLE: true,
         FEATURE_IMAGE_PROMOTION_ENABLE: false,
         FEATURE_CD_MANDATORY_PLUGINS_ENABLE: true,
         FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS: false,

diff --git a/yarn.lock b/yarn.lock
@@ -974,10 +974,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected]3-beta-1":
-  version "1.3.0-patch-3-beta-1"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.3.0-patch-3-beta-1.tgz#deb4346d04106c579df706d5c829d200b0e23e32"
-  integrity sha512-dFDJbUtKZXtIHgwd15Cz59TQnVOA2Z7KK38cdEe7DF+JRHfIDlOfQzP20wd/RWjk1WxjSuYbp9MBwW3kJ/DhnQ==
+"@devtron-labs/[email protected]4-beta-1":
+  version "1.3.0-patch-4-beta-1"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.3.0-patch-4-beta-1.tgz#b6fcb3f198bfac3eb53ae0227393100ee74a2b76"
+  integrity sha512-zc0tSCsBoVAR7WHiMChxDJctLO9uLGT8Gzc/6Sc8kkfgA4yCWVHo2J9+e1SH5iYcdeqpi0AwTzozxocmwz/yxg==
   dependencies:
     "@types/react-dates" "^21.8.6"
     ansi_up "^5.2.1"
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,3 +11,4 @@ types: @@
       - doc
       - release
       - misc
+      - sync