Merge remote-tracking branch 'upstream/master' into selection-in-nav

Signed-off-by: Pranav Singh <[email protected]>

.github/workflows/e2etest.yaml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2.5.0
+        uses: actions/checkout@v3
       - name: Uploading file
         uses: actions/upload-artifact@v3
         with:

.github/workflows/test_adaptersv2.yaml

@@ -164,7 +164,7 @@ jobs:
           config='{"contexts":{"local":{"endpoint":'$svcip',"token":"default","platform":"kubernetes","adapters":[],"channel":"stable","version":"latest"}},"current-context":"local","tokens":[{"location":"auth.json","name":"default"}]}'
           echo $config  > ~/.meshery/config.yaml
       - name: Download patternfile
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: patternfile
       - name: Wait for Meshery pods to come up
@@ -260,7 +260,7 @@ jobs:
           echo $(jq '.metadata."meshery-server-version" |="'$MESHERY_VERSION'"' data.json ) > data.json
           echo "exitstatus=$exitstatus" >> $GITHUB_ENV
       - name: UploadResults
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ inputs.output_filename }}
           path: ./${{ inputs.output_filename }}

docs/_compatibility/meshery-nginx-sm/09-23-2023-13-38-09_d219c66b.md

@@ -0,0 +1,14 @@
+---
+timestamp: "2023-09-23 13:38:34 UTC Sat"
+meshery-component: meshery-nginx-sm
+meshery-component-version: edge
+meshery-server-version: "*name"
+k8s-distro: minikube
+k8s-version: "v1.25.2"
+service-mesh: nginx
+service-mesh-version: "v2.0.0"
+tests:
+  pod/nginx-mesh-api:  "Not Running"
+  pod/nginx-mesh-metrics: "Not Running"
+overall-status: "failing"
+---

docs/_releases/v0.6.146.md

@@ -0,0 +1,28 @@
+---
+layout: release
+date: 2023-09-24
+tag: v0.6.146
+---
+
+## What's New
+## 🔤 General
+- MeshKit v0.6.67 @leecalcote (#8897)
+
+## 🖥 Meshery UI
+
+- [UI] Notification Center: Increase size of unread indicator @leecalcote (#8891)
+- [extensions] fix error msg @theBeginner86 (#8892)
+- changed smi_results.js @EraKin575 (#8868)
+- Connections row expand data with styling @senali-d (#8840)
+- [Fix] k8s-switcher select-all @aabidsofi19 (#8876)
+- [CI] e2e test job improvements @MarioArriaga92 (#8643)
+
+## 🧰 Maintenance
+
+- updating node versions workflow actions @Philip-21 (#8856)
+- [CI] e2e test job improvements @MarioArriaga92 (#8643)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@EraKin575, @MUzairS15, @MarioArriaga92, @Philip-21, @aabidsofi19, @l5io, @leecalcote, @senali-d, @theBeginner86 and l5io

docs/_releases/v0.6.147.md

@@ -0,0 +1,16 @@
+---
+layout: release
+date: 2023-09-24
+tag: v0.6.147
+---
+
+## What's New
+## 🔤 General
+## 🖥 Meshery UI
+
+- Revert "[Fix] k8s-switcher select-all" @theBeginner86 (#8898)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@leecalcote and @theBeginner86

docs/pages/reference/error-codes.md

@@ -59,6 +59,13 @@ language: en
           e.style.visibility = 'visible';
           }
     }
+    // Function to handle anchor links
+    document.addEventListener('click', function (event) {
+      if (event.target.tagName === 'A' && event.target.getAttribute('href').startsWith('#')) {
+        window.location.hash = event.target.getAttribute('href');
+      }
+    });
+
 </script>
 
 ## Error Codes and Troubleshooting

go.mod

@@ -40,7 +40,7 @@ require (
 	github.com/jinzhu/copier v0.3.5
 	github.com/layer5io/gowrk2 v0.6.1
 	github.com/layer5io/meshery-operator v0.6.10
-	github.com/layer5io/meshkit v0.6.66
+	github.com/layer5io/meshkit v0.6.67
 	github.com/layer5io/meshsync v0.6.14
 	github.com/layer5io/nighthawk-go v1.0.6
 	github.com/layer5io/service-mesh-performance v0.6.1

go.sum

@@ -1571,8 +1571,8 @@ github.com/layer5io/gowrk2 v0.6.1 h1:0eBj7VFYJ+QTMJt7i3PzxDJTEL+X+zWx4OP+lARWIoI
 github.com/layer5io/gowrk2 v0.6.1/go.mod h1:ugxQ23+HwQ8dmZYJd1LScw/TLKbdgfN6OOtg6iYMljg=
 github.com/layer5io/meshery-operator v0.6.10 h1:4YiznhS4AO/bA+uHBxCYp9Fc9w9LU2sopE3oJBdRU/Y=
 github.com/layer5io/meshery-operator v0.6.10/go.mod h1:RX9yjSvJS0KAdWOb/zRfYU/mSOVP1ySuUUlxHhrms1M=
-github.com/layer5io/meshkit v0.6.66 h1:oJKgab+7nlp2EArTwq9r0ZW+/+UIPrY5Efs4eLqIpdg=
-github.com/layer5io/meshkit v0.6.66/go.mod h1:/EX5QLmgZpLPqhBHGvNqyHM6ljfc6hYwULCEcnqTCVw=
+github.com/layer5io/meshkit v0.6.67 h1:stGbf3AMZLYLEZH6ZI8mB+KMmJu4xXKoP5xARM6jftA=
+github.com/layer5io/meshkit v0.6.67/go.mod h1:/EX5QLmgZpLPqhBHGvNqyHM6ljfc6hYwULCEcnqTCVw=
 github.com/layer5io/meshsync v0.6.14 h1:y5Fbq76WGYWjdzYFNOD1YgowP/0m/NxPZ/hA1JGJ3RA=
 github.com/layer5io/meshsync v0.6.14/go.mod h1:21VTdYITKXpBSb+kj2CcR3T0KbrcLJwhiewQRKTqvUM=
 github.com/layer5io/nighthawk-go v1.0.6 h1:YMCw65FvwpbByX+M7McdNYRNDW9oOw3GQaXJ1RMDdGw=

server/models/remote_auth.go

@@ -37,7 +37,7 @@ func (l *RemoteProvider) DoRequest(req *http.Request, tokenString string) (*http
 		return nil, ErrTokenRefresh(err)
 	}
 
-	if resp.StatusCode == 401 || resp.StatusCode == 403 {
+	if resp.StatusCode == 401 {
 		// Read and close response body before reusing request
 		// https://github.com/golang/go/issues/19653#issuecomment-341540384
 		_, _ = io.ReadAll(resp.Body)

ui/.babelrc

@@ -1,15 +1,17 @@
 {
-    "presets": ["next/babel"],
-    "plugins": [
-      "relay",
-      [
-        "istanbul",
-        {
-          "exclude": [
-            "**/*.spec.js",
-            "pages/_document.js"
-          ]
-        }
-      ]
+  "presets": [
+    "next/babel"
+  ],
+  "plugins": [
+    "relay",
+    [
+      "istanbul",
+      {
+        "exclude": [
+          "**/*.spec.js",
+          "pages/_document.js"
+        ]
+      }
     ]
-  }
+  ]
+}

ui/.eslintignore

@@ -7,4 +7,4 @@ package-lock.json
 nodemon.json
 lib/
 cypress/
-pages/_document.js
+**/__generated__/**

ui/.eslintrc.js

@@ -1,99 +1,60 @@
 module.exports = {
-  env : {
-    browser : true,
-    es6 : true,
-    node : true, // tells the parser that we are using nodejs
+  env: {
+    browser: true,
+    es6: true,
+    node: true, // tells the parser that we are using nodejs
   },
 
-  settings : {
-    react : {
-      version : require("./package.json").dependencies.react,
+  settings: {
+    react: {
+      version: require('./package.json').dependencies.react,
     },
   },
-  extends : ["eslint:recommended", "plugin:react/recommended", "plugin:cypress/recommended", "next"],
-  globals : {
-    Atomics : "readonly",
-    SharedArrayBuffer : "readonly",
-    globalThis : "readonly",
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:cypress/recommended',
+    'next',
+    'plugin:prettier/recommended',
+],
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+    globalThis: 'readonly',
   },
-  parser : "@babel/eslint-parser",
-  parserOptions : {
-    ecmaFeatures : {
-      jsx : true,
+  parser: '@babel/eslint-parser',
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
     },
-    ecmaVersion : 2018,
-    sourceType : "module",
+    ecmaVersion: 2018,
+    sourceType: 'module',
   },
-  plugins : ["react", "cypress"],
-  rules : {
-    "@next/next/no-img-element" : "off",
-    // turn off next img/image warning
-    "react-hooks/rules-of-hooks" : "warn",
-    // warn about react-hooks
-    "react-hooks/exhaustive-deps" : "off",
-    // turn off react-hooks exhaustive-deps for now
-    "jsx-a11y/alt-text" : "off",
-    // turn off image alt text warning
-    "valid-typeof" : "warn",
-    // show warning for now
-    "array-bracket-spacing" : ["error", "never"],
-    "comma-style" : ["error"],
-    "jsx-quotes" : ["error", "prefer-double"],
-    "block-scoped-var" : "error",
-    "keyword-spacing" : "error",
-    "no-trailing-spaces" : "error",
-    "object-curly-spacing" : ["error", "always"],
-    "arrow-spacing" : [
-      "error",
-      {
-        before : true,
-        after : true,
-      },
-    ],
-    "key-spacing" : [
-      "error",
-      {
-        afterColon : true,
-        beforeColon : true
-      },
-    ],
-    "block-spacing" : "error",
-    "brace-style" : ["error", "1tbs"],
-    indent : [
-      "error",
-      2,
-      {
-        FunctionExpression : {
-          parameters : "first",
-        },
-        FunctionDeclaration : {
-          parameters : "first",
-        },
-        MemberExpression : 1,
-        SwitchCase : 1,
-        outerIIFEBody : 0,
-        VariableDeclarator : {
-          var : 2,
-          let : 2,
-          const : 3,
-        },
-        ignoredNodes : ["TemplateLiteral"],
-      },
-    ],
-    "react/react-in-jsx-scope" : "off",
-    "no-undef" : "error",
-    "react/jsx-uses-vars" : [2],
-    "react/jsx-no-undef" : "error",
-    "no-console" : 0,
-    "no-unused-vars" : "error",
-    "react/jsx-key" : "warn",
-    "no-dupe-keys" : "error",
-    "react/jsx-filename-extension" : [
+  plugins: ['react', 'cypress', 'prettier'],
+  rules: {
+    '@next/next/no-img-element': 'off',
+    'react-hooks/rules-of-hooks': 'warn',
+    'react-hooks/exhaustive-deps': 'off',
+    'jsx-a11y/alt-text': 'off',
+    'valid-typeof': 'warn',
+    'no-trailing-spaces': 'error',
+    'block-spacing': 'error',
+    'brace-style': ['error', '1tbs'],
+    'react/react-in-jsx-scope': 'off',
+    'no-undef': 'error',
+    'react/jsx-uses-vars': [2],
+    'react/jsx-no-undef': 'error',
+    'no-console': 0,
+    'no-unused-vars': 'error',
+    'react/jsx-key': 'warn',
+    'no-dupe-keys': 'error',
+    'react/jsx-filename-extension': [
       1,
       {
-        extensions : [".js", ".jsx"],
+        extensions: ['.js', '.jsx'],
       },
     ],
-    "react/prop-types" : "off",
+    'react/prop-types': 'off',
+    'prettier/prettier': 'warn',
   },
-};
+};

ui/.lintstagedrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  // Lint & Prettify TS and JS files
+  '**/*.(ts|tsx|js|jsx)': (filenames) => [`npm run lint:fix`, `npm run format`],
+
+  // Prettify only Markdown and JSON files
+  '**/*.(md|json)': (filenames) => `npx prettier --write ${filenames.join(' ')}`,
+};

ui/.prettierignore

@@ -0,0 +1,14 @@
+*.svg
+*.ico
+*.css
+
+*/.DS_Store
+assets/**
+.next
+package-lock.json
+public
+node_modules
+next-env.d.ts
+next.config.js
+.eslintrc.js
+**/__generated__/**

ui/.prettierrc.yml

@@ -0,0 +1,12 @@
+arrowParens: always
+bracketSameLine: false
+bracketSpacing: true
+jsxSingleQuote: false
+proseWrap: preserve
+quoteProps: as-needed
+semi: true
+singleQuote: true
+tabWidth: 2
+trailingComma: all
+printWidth: 100
+useTabs: false