Merge branch 'master' into update-build-node

argoproj · Jan 5, 2024 · 85412af · 85412af
2 parents 48aec30 + c65a952
commit 85412af
Show file tree

Hide file tree

Showing 20 changed files with 626 additions and 188 deletions.
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -7,8 +7,8 @@ jobs:
   build-docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
       - run: yarn install

diff --git a/.github/workflows/build-v1.yml b/.github/workflows/build-v1.yml
@@ -10,8 +10,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
       - run: yarn install

diff --git a/.github/workflows/npm-publish-v1.yml b/.github/workflows/npm-publish-v1.yml
@@ -9,8 +9,8 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
       - run: npm publish

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -11,10 +11,10 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.tag }}
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
       - run: cd v2 && npm publish

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'Stale issue message'

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
         "@tippy.js/react": "^3.1.1",
         "antd": "^5.6.1",
         "classnames": "^2.2.6",
-        "core-js": "^3.30.2",
+        "core-js": "^3.32.1",
         "foundation-sites": "^6.4.3",
         "history": "^4.10.1",
         "moment": "^2.29.4",
@@ -36,7 +36,7 @@
         "react-helmet": "^6.1.0",
         "react-router-dom": "^4.2.2",
         "react-toastify": "9.0.8",
-        "rxjs": "^7.5.6",
+        "rxjs": "^7.8.1",
         "typescript": "^4.9.5",
         "uuid": "^9.0.0",
         "xterm": "^4.19.0",
@@ -48,15 +48,15 @@
         "moment": "^2.29.1",
         "react": "^16.9.3",
         "react-dom": "^16.9.3",
-        "rxjs": "^7.5.6"
+        "rxjs": "^7.8.1"
     },
     "devDependencies": {
         "@babel/core": "^7.21.3",
         "@dump247/storybook-state": "^1.6.1",
-        "@storybook/addon-actions": "^7.0.20",
+        "@storybook/addon-actions": "^7.4.0",
         "@storybook/addon-controls": "^6.5.9",
         "@storybook/addon-essentials": "^6.5.14",
-        "@storybook/addon-links": "^6.5.16",
+        "@storybook/addon-links": "^7.4.0",
         "@storybook/addons": "^7.0.20",
         "@storybook/react": "^6.2.9",
         "@testing-library/react": "^12.1.5",
@@ -80,7 +80,7 @@
         "@types/storybook__addon-actions": "^5.2.1",
         "@types/storybook__addon-links": "^3.3.0",
         "@types/storybook__react": "^3.0.7",
-        "@types/uuid": "^9.0.1",
+        "@types/uuid": "^9.0.3",
         "@types/yamljs": "^0.2.31",
         "babel-loader": "^8.2.5",
         "chai": "^4.3.7",
@@ -117,7 +117,7 @@
         "storybook": "^6.5.14",
         "style-loader": "^2.0.0",
         "ts-jest": "^26.5.6",
-        "ts-loader": "^9.4.3",
+        "ts-loader": "^9.4.4",
         "ts-node": "^10.9.1",
         "tslint": "^5.20.1",
         "tslint-react": "^3.4.0",

diff --git a/src/assets/fonts/argo-icon.eot b/src/assets/fonts/argo-icon.eot
diff --git a/src/assets/fonts/argo-icon.svg b/src/assets/fonts/argo-icon.svg
diff --git a/src/assets/fonts/argo-icon.ttf b/src/assets/fonts/argo-icon.ttf
diff --git a/src/assets/fonts/argo-icon.woff b/src/assets/fonts/argo-icon.woff
diff --git a/src/components/popup/popup.scss b/src/components/popup/popup.scss
@@ -1,4 +1,5 @@
 @import '../../styles/config';
+@import '../../styles/theme';
 
 $popup-border-radius: 8px;
 
@@ -9,12 +10,17 @@ $popup-border-radius: 8px;
     width: 100%;
     height: 100%;
     z-index: 200;
+    // Just in case the theme class is not added
     background-color: rgba(222, 222, 222, 0.62); /*dim the background*/
-    border: 1px solid $argo-color-gray-4;
+    @include themify($themes) {
+        background-color: themed('overlay');        
+    }
 
     .popup-container {
         position: relative;
-        box-shadow: 3px 3px 20px #888888;
+        @include themify($themes) {
+            box-shadow: 3px 3px 20px themed('shadow');
+        }
         margin: 0 auto;
         top: 50%;
         transform: translateY(-50%);
@@ -47,7 +53,11 @@ $popup-border-radius: 8px;
             }
 
             &__normal {
+                // Just in case the theme class is not added
                 background-color: $argo-color-gray-2;
+                @include themify($themes) {
+                    background-color: themed('light-argo-gray-2');
+                }
             }
 
             &__red {
@@ -61,7 +71,11 @@ $popup-border-radius: 8px;
         }
 
         &__footer {
+            // Just in case the theme class is not added
             background-color: $argo-color-gray-1;
+            @include themify($themes) {
+                background-color: themed('background-2');        
+            }
             bottom: 0;
             padding-top: 20px;
             padding-left: 30px;
@@ -80,7 +94,11 @@ $popup-border-radius: 8px;
         }
 
         &__body {
+            // Just in case the theme class is not added
             background-color: $argo-color-gray-1;
+            @include themify($themes) {
+                background-color: themed('background-2');        
+            }
 
             &__hasNoIcon {
                 padding-left: 30px;
@@ -101,7 +119,12 @@ $popup-border-radius: 8px;
                 font-size: 15px;
                 margin-top: 10px;
                 margin-bottom: 10px;
+                // Just in case the theme class is not added
                 color: $argo-color-gray-6;
+
+                @include themify($themes) {
+                    color: themed('light-argo-gray-6');        
+                }
             }
         }
 

diff --git a/src/components/select/select.scss b/src/components/select/select.scss
@@ -1,4 +1,5 @@
 @import '../../styles/config';
+@import '../../styles/theme';
 
 .select {
     position: relative;
@@ -15,12 +16,14 @@
         position: relative;
         padding: 8px 20px 8px 0;
         font-size: 15px;
-        border-bottom: 2px solid #ccc;
         transition: border .2s;
         cursor: pointer;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        @include themify($themes) {      
+            border-bottom: 2px solid themed('border');;
+        }
     }
 
     &__value-arrow {

diff --git a/src/components/sliding-panel/sliding-panel.scss b/src/components/sliding-panel/sliding-panel.scss
@@ -103,8 +103,8 @@ $sliding-panel-middle-width: 600px;
         color: $argo-color-gray-5;
         @include themify($themes) {                  
             background-color: themed('light-argo-gray-2');
+            border-bottom: 1px solid themed('border');
         }
-        border-bottom: 1px solid #c6cfd1;
         font-weight: 500;
         font-size: .925em;
 

diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss
@@ -57,6 +57,10 @@
             box-shadow: none;
             border-bottom: 1px solid $argo-color-gray-4;
 
+            .theme-dark & {
+                border-color: $argo-color-gray-7;
+            }
+
             a {
                 color: $argo-color-teal-5;
 

diff --git a/src/components/top-bar/top-bar.scss b/src/components/top-bar/top-bar.scss
@@ -5,11 +5,15 @@
 .top-bar {
     line-height: $top-bar-height;
     @include themify($themes) {
-        background: themed('background-2');        
+        background: themed('background-2');
     }
     transition: right .5s;
     border-bottom: 1px solid $argo-color-gray-2;
 
+    .theme-dark & {
+        border-color: $argo-color-gray-7;
+    }
+
     &__left-side {
         padding-left: 20px;
         white-space: nowrap;

diff --git a/src/styles/argo-icon.scss b/src/styles/argo-icon.scss
@@ -14,10 +14,10 @@ $argo-icon-fonts-root: '/' !default;
 
 @font-face {
     font-family: "argo-icon";
-    src: url($argo-icon-fonts-root + "argo-icon.eot?af0f627a6b22b6f9f7b649206eee4263?#iefix") format("embedded-opentype"),
-url($argo-icon-fonts-root + "argo-icon.woff?af0f627a6b22b6f9f7b649206eee4263") format("woff"),
-url($argo-icon-fonts-root + "argo-icon.ttf?af0f627a6b22b6f9f7b649206eee4263") format("truetype"),
-url($argo-icon-fonts-root + "argo-icon.svg?af0f627a6b22b6f9f7b649206eee4263#argo-icon") format("svg");
+    src: url($argo-icon-fonts-root + "argo-icon.eot?dc7d942cb67a42904c1a8d10acd6973a?#iefix") format("embedded-opentype"),
+url($argo-icon-fonts-root + "argo-icon.woff?dc7d942cb67a42904c1a8d10acd6973a") format("woff"),
+url($argo-icon-fonts-root + "argo-icon.ttf?dc7d942cb67a42904c1a8d10acd6973a") format("truetype"),
+url($argo-icon-fonts-root + "argo-icon.svg?dc7d942cb67a42904c1a8d10acd6973a#argo-icon") format("svg");
 }
 
 i {

diff --git a/src/styles/elements/containers.scss b/src/styles/elements/containers.scss
@@ -95,12 +95,15 @@
                 color: themed('text-2');    
             }
             .columns {
-                border-bottom: 1px solid $argo-color-gray-3;
                 padding: 0;
                 vertical-align: middle;
                 line-height: 50px;
                 overflow-wrap: break-word;
 
+                @include themify($themes) {
+                    border-bottom: 1px solid themed('border');    
+                }
+
                 &--narrower-height {
                     line-height: 20px;
                     padding: 14px 0;

diff --git a/src/styles/elements/form-controls.scss b/src/styles/elements/form-controls.scss
@@ -74,9 +74,9 @@
     background-color: transparent;
     @include themify($themes) {                  
         color: themed('text-2');
+        border-bottom: 2px solid themed('border');;
     }
     border: 0;
-    border-bottom: 2px solid #ccc;
     transition: border .2s;
 
     .error & {

diff --git a/src/styles/theme.scss b/src/styles/theme.scss
@@ -12,7 +12,10 @@ $themes: (
         light-argo-teal-7: $argo-color-teal-7,
         light-argo-teal-5: $argo-color-teal-5,
         pod-cyan: lightcyan,
-        layout-loader-bg: rgba($argo-color-gray-7, 0.4),  
+        layout-loader-bg: rgba($argo-color-gray-7, 0.4),
+        overlay: rgba(222, 222, 222, 0.62),
+        shadow: $argo-color-gray-5,
+        border: $argo-color-gray-3
     ),
     dark: (
         background-1: $dark-theme-background-1,
@@ -26,7 +29,9 @@ $themes: (
         light-argo-teal-5: $argo-color-teal-4,
         pod-cyan: $argo-color-teal-8,
         layout-loader-bg: rgba($argo-color-gray-3, 0.4),
-
+        overlay: rgba(70, 70, 70, 0.62),
+        shadow: $dark-theme-background-1,
+        border: $argo-color-gray-7
     )
 );