Merge pull request #2960 from Azure/main

Merge main into stable for release 2.22.0
Azure · Dec 6, 2024 · 71b4b69 · 71b4b69
2 parents 6f0cd18 + 4a73c20
commit 71b4b69
Show file tree

Hide file tree

Showing 213 changed files with 489 additions and 9,775 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -49,11 +49,6 @@
     ],
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  // Python
-  "python.autoComplete.extraPaths": [
-    "${workspaceRoot}/python"
-  ],
-  "python.formatting.provider": "yapf",
   // Typescript
   "typescript.tsdk": "node_modules/typescript/lib",
   // General
@@ -63,7 +58,6 @@
     "**/build/**": true,
     "**/lib/**": true,
     "**/lib-*/**": true,
-    "desktop/python/build/**": true,
     "desktop/release/**": true,
     "desktop/dll/**": true
   },

diff --git a/.vsts/common/setup-python.sh b/.vsts/common/setup-python.sh
diff --git a/.vsts/darwin/ci.yml b/.vsts/darwin/ci.yml
@@ -2,7 +2,6 @@ steps:
   - template: ./darwin-dependencies.yml
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       npm run build:package
     displayName: Build and pack
   - template: ../common/publish-artifacts.yml

diff --git a/.vsts/darwin/distribution.yml b/.vsts/darwin/distribution.yml
@@ -9,7 +9,6 @@ steps:
 
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       npm run build:prod
     displayName: Build packages
 
@@ -40,8 +39,6 @@ steps:
 
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
-      npm run build-python
       npm run package darwin-app
       cd ./release/mac
       zip -y -r ../BatchExplorer-mac.zip ./BatchExplorer.app
@@ -54,7 +51,6 @@ steps:
 
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       unzip ./release/BatchExplorer*.zip -d ./release/mac
       ls ./release/mac
       rm -f ./release/mac/*.pkg

diff --git a/.vsts/dependencies.yml b/.vsts/dependencies.yml
@@ -1,3 +1,2 @@
 steps:
   - template: ./node-setup.yml
-  - template: ./python-setup.yml
diff --git a/.vsts/linux/ci.yml b/.vsts/linux/ci.yml
@@ -3,7 +3,6 @@ steps:
 
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       npm run build:package
     displayName: Build and pack
 

diff --git a/.vsts/linux/distribution.yml b/.vsts/linux/distribution.yml
@@ -9,7 +9,6 @@ steps:
 
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       npm run build:package
     displayName: Build and pack
 
@@ -40,7 +39,6 @@ steps:
 
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       npm run package linux-manifest
     workingDirectory: desktop
     displayName: Create manifest

diff --git a/.vsts/python-setup.yml b/.vsts/python-setup.yml
diff --git a/.vsts/win/ci.yml b/.vsts/win/ci.yml
@@ -3,7 +3,6 @@ steps:
   - template: ./win-dependencies.yml
 
   - pwsh: |
-      $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
       npm run build:package
     displayName: Build and package
 

diff --git a/.vsts/win/distribution.yml b/.vsts/win/distribution.yml
@@ -18,15 +18,12 @@ steps:
   - pwsh: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
-      $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
       exec { npm run build:prod }
     displayName: Build all packages
 
   - pwsh: |
       . ../.vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
-      $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
-      exec { npm run build-python }
       exec { npm run package win-exe }
     workingDirectory: desktop
     displayName: Build .exe
@@ -39,7 +36,6 @@ steps:
       pattern: |
         **/*.exe
         **/*.dll
-        !**/python36.dll
 
   - pwsh: npm run package win-installer
     workingDirectory: desktop

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# 2.22.0
+
+[All items](https://github.com/Azure/BatchExplorer/milestone/56?closed=1)
+
+### Bug
+
+* Server errors appeared as blank alerts [\#2954](https://github.com/Azure/BatchExplorer/issues/2954)
+* Uploaded directories in File Explorer were flattened in the remote destination [\#2956](https://github.com/Azure/BatchExplorer/issues/2956)
+
+### Other
+
+* Removes Python from Batch Explorer [\#2955](https://github.com/Azure/BatchExplorer/issues/2955)
+* Removes Gallery from global navigation [\#2957](https://github.com/Azure/BatchExplorer/issues/2957)
+
 # 2.21.0
 
 [All items](https://github.com/Azure/BatchExplorer/milestone/55?closed=1)

diff --git a/Localize/loc/de/desktop/i18n/resources.resjson.lcl b/Localize/loc/de/desktop/i18n/resources.resjson.lcl
@@ -484,6 +484,9 @@
       <Item ItemId=";auth.not-logged-in" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are not logged in. Please log in to continue.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Sie sind nicht angemeldet. Bitte melden Sie sich an, um fortzufahren.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -499,12 +502,18 @@
       <Item ItemId=";auth.tenant-sign-in-title" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Sign in to {tenant}]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Anmelden bei {tenant}]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";auth.welcome" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Welcome to Azure Batch Explorer]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Willkommen bei Azure Batch Explorer]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -1051,6 +1060,9 @@
       <Item ItemId=";common.welcome" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Welcome to Batch Explorer]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Willkommen bei Batch Explorer]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -3667,12 +3679,18 @@
       <Item ItemId=";settings.external-browser-auth" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Use system browser for authentication]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Verwenden des Systembrowsers für die Authentifizierung]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";settings.external-browser-auth-hint" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Organizations with certain access policies may require sign-in with an internal window. Unset if you experience issues.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Organisationen mit bestimmten Zugriffsrichtlinien erfordern möglicherweise die Anmeldung mit einem internen Fenster. Heben Sie die Einstellung auf, wenn Sie Probleme haben.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -4542,4 +4560,4 @@
       </Item>
     </Item>
   </Item>
-</LCX>
+</LCX>
diff --git a/Localize/loc/es/desktop/i18n/resources.resjson.lcl b/Localize/loc/es/desktop/i18n/resources.resjson.lcl
@@ -484,6 +484,9 @@
       <Item ItemId=";auth.not-logged-in" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are not logged in. Please log in to continue.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[No ha iniciado sesión. Inicie sesión para continuar.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -499,12 +502,18 @@
       <Item ItemId=";auth.tenant-sign-in-title" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Sign in to {tenant}]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Iniciar sesión en {tenant}]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";auth.welcome" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Welcome to Azure Batch Explorer]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Le damos la bienvenida a Azure Batch Explorer]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -1051,6 +1060,9 @@
       <Item ItemId=";common.welcome" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Welcome to Batch Explorer]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Le damos la bienvenida a Batch Explorer]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -3667,12 +3679,18 @@
       <Item ItemId=";settings.external-browser-auth" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Use system browser for authentication]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Usar el explorador del sistema para la autenticación]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";settings.external-browser-auth-hint" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Organizations with certain access policies may require sign-in with an internal window. Unset if you experience issues.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Las organizaciones con determinadas directivas de acceso pueden requerir el inicio de sesión con una ventana interna. Desactívelo si experimenta problemas.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -4542,4 +4560,4 @@
       </Item>
     </Item>
   </Item>
-</LCX>
+</LCX>
diff --git a/Localize/loc/hu/desktop/i18n/resources.resjson.lcl b/Localize/loc/hu/desktop/i18n/resources.resjson.lcl
@@ -484,6 +484,9 @@
       <Item ItemId=";auth.not-logged-in" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are not logged in. Please log in to continue.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Nincs bejelentkezve. Kérjük, a folytatáshoz jelentkezzen be.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -499,12 +502,18 @@
       <Item ItemId=";auth.tenant-sign-in-title" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Sign in to {tenant}]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Bejelentkezés a(z) {tenant} bérlőbe]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";auth.welcome" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Welcome to Azure Batch Explorer]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Üdvözli az Azure Batch Explorer]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -1051,6 +1060,9 @@
       <Item ItemId=";common.welcome" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Welcome to Batch Explorer]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Üdvözli a Batch Explorer]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -3667,12 +3679,18 @@
       <Item ItemId=";settings.external-browser-auth" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Use system browser for authentication]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Rendszerböngésző használata a hitelesítéshez]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";settings.external-browser-auth-hint" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Organizations with certain access policies may require sign-in with an internal window. Unset if you experience issues.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Adott hozzáférési szabályzatokkal rendelkező szervezetek megkövetelhetik a belső ablakkal történő bejelentkezést. Ha problémákat tapasztal, törölje a beállítását.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -4542,4 +4560,4 @@
       </Item>
     </Item>
   </Item>
-</LCX>
+</LCX>