From d300f8110afcef9897faec7c775214794214d686 Mon Sep 17 00:00:00 2001 From: Pier Paolo MAMMI Date: Fri, 20 Nov 2026 13:26:48 +0100 Subject: [PATCH] update scripts and environment to export module by ID --- .env.template | 3 +- export-and-extract-elx.bat | 17 +++--- export-elx.bat | 2 +- scripts/elx-tools-module.psm1 | 103 +++++++++++++++++++++++++++++++--- scripts/export-elx.ps1 | 18 +++--- 5 files changed, 117 insertions(+), 26 deletions(-) diff --git a/.env.template b/.env.template index f811d06..f0c084f 100644 --- a/.env.template +++ b/.env.template @@ -3,4 +3,5 @@ # IMPORTANT #2: Surround values with quotes if they contain spaces or special characters! ELIXFORMS_USERNAME= ELIXFORMS_PASSWORD= -ELIXFORMS_MODULE_TAG= \ No newline at end of file +ELIXFORMS_MODULE= +ELIXFORMS_AJSRV= \ No newline at end of file diff --git a/export-and-extract-elx.bat b/export-and-extract-elx.bat index b2809da..f831ad6 100644 --- a/export-and-extract-elx.bat +++ b/export-and-extract-elx.bat @@ -4,21 +4,22 @@ echo %cmdcmdline% | findstr /i /c:"%~nx0" >NUL && set iscommandline=1 echo %PSModulePath% | findstr /i /c:"%USERPROFILE%" >NUL && set ispowershell=1 cd /D "%~dp0" -SET UserModuleTag= +SET UserModuleId= +SET ModuleTag= IF "%~1"=="" ( - echo Module tag not specified. - set /p UserModuleTag=Insert module tag: - IF "!UserModuleTag!"=="" ( - echo Module tag is required to extract internals! + echo Module ID not specified. + set /p UserModuleId=Insert module ID: + IF "!UserModuleId!"=="" ( + echo Module ID is required to extract internals! exit /b 1 ) ELSE ( - set ModuleTag=!UserModuleTag! + set ModuleId=!UserModuleId! ) ) ELSE ( - set ModuleTag=%~1 + set ModuleId=%~1 ) -call export-elx.bat "!ModuleTag!" && call extract-elx-internals.bat "!ModuleTag!" +call export-elx.bat "!ModuleId!" && call extract-elx-internals-last-updated.bat IF DEFINED iscommandline IF NOT DEFINED ispowershell pause ENDLOCAL diff --git a/export-elx.bat b/export-elx.bat index 00e8314..a31299f 100644 --- a/export-elx.bat +++ b/export-elx.bat @@ -18,7 +18,7 @@ IF "%~1"=="" ( set ModuleTag=%~1 ) -@pwsh -NoProfile -ExecutionPolicy Bypass -Command .\scripts\export-elx.ps1 -ModuleTag %ModuleTag% +@pwsh -NoProfile -ExecutionPolicy Bypass -Command .\scripts\export-elx.ps1 -Module %ModuleTag% IF DEFINED iscommandline IF NOT DEFINED ispowershell pause ENDLOCAL diff --git a/scripts/elx-tools-module.psm1 b/scripts/elx-tools-module.psm1 index 6d7e02e..de3d4bd 100644 --- a/scripts/elx-tools-module.psm1 +++ b/scripts/elx-tools-module.psm1 @@ -53,17 +53,17 @@ function Save-ElxInternals { function New-EnvFileContent { param( - [ValidateNotNullOrEmpty()][Parameter(Mandatory)][string]$ModuleTag + [ValidateNotNullOrEmpty()][Parameter(Mandatory)][string]$Module ) - $envValues = Get-EnvironmentFromFile -ModuleTag $ModuleTag + $envValues = Get-EnvironmentFromFile -Module $Module $out = ($envValues.Keys | ForEach-Object { "$_='$($envValues[$_])'" }) -join "`n" } function Get-EnvironmentFromFile { param( - [ValidateNotNullOrEmpty()][Parameter(Mandatory)][string]$ModuleTag + [ValidateNotNullOrEmpty()][Parameter(Mandatory)][string]$Module ) $envFileScriptPath = Join-Path $PSScriptRoot "../" @@ -87,15 +87,15 @@ function Get-EnvironmentFromFile { $value = $parts[1].Trim().Trim("'").Trim('"') $envValues[$name] = $value } - if ($name -eq 'ELIXFORMS_MODULE_TAG') { - $envValues[$name] = $ModuleTag + if ($name -eq 'ELIXFORMS_MODULE') { + $envValues[$name] = $Module } } $envValues } -function Export-ElxModule { +function Export-ElxModuleSelenium { param( [ValidateNotNullOrEmpty()][Parameter(Mandatory)][string]$ModuleTag, [ValidateScript({ Test-Path $_ })][Parameter(Mandatory)]$ModulePath @@ -118,7 +118,7 @@ function Export-ElxModule { Write-Error "npm is not installed or not found in PATH. Please install Node.js and npm, then try again." exit 1 } - Start-Process pwsh -ArgumentList "$NpmPath run export" -Environment (Get-EnvironmentFromFile -ModuleTag $ModuleTag) -NoNewWindow -Wait -PassThru | Out-Null + Start-Process pwsh -ArgumentList "$NpmPath run export" -Environment (Get-EnvironmentFromFile -Module $ModuleTag) -NoNewWindow -Wait -PassThru | Out-Null if ($LASTEXITCODE -and ($LASTEXITCODE -ne 0)) { Write-Error "Module export for '$ModuleTag' failed with exit code $LASTEXITCODE." @@ -149,6 +149,92 @@ function Export-ElxModule { } } +function Export-ElxModuleManual { + param( + [ValidateNotNullOrEmpty()][Parameter(Mandatory)][string]$ModuleId, + [ValidateScript({ Test-Path $_ })][Parameter(Mandatory)]$ModulePath + ) + + if (-not $Quiet) { + Write-Host "Checking authentication environment variable..." + } + + $CurrentEnvironment = Get-EnvironmentFromFile -Module $ModuleId + + if (-not ($CurrentEnvironment["ELIXFORMS_AJSRV"])) { + Write-Error "Required environment variable 'ELIXFORMS_AJSRV' is missing. Please ensure .env file is correctly configured." + exit 1 + } + + try { + if (-not $Quiet) { + Write-Host "Switching to manual export directory..." + } + + $manualExportPath = Join-Path $PSScriptRoot "../tools/manual-export/downloads" + if (-not (Test-Path -Path $manualExportPath)) { + New-Item -ItemType Directory -Path $manualExportPath -Force | Out-Null + } + + Push-Location -StackName ManualExport $manualExportPath + + if (-not $Quiet) { + Write-Host "Executing module export for Module ID '$ModuleId'..." + } + + $Response = Invoke-WebRequest ` + -Headers @{ "Cookie" = "AJSRV=$($CurrentEnvironment['ELIXFORMS_AJSRV'])" } ` + "https://console-unipr.elixforms.it/AJSRV/ELIXFORMS/moduleExport?MODULE_ID=$($ModuleId)&exportProtocol=true" + + if (-not $Response.StatusCode -eq 200) { + Write-Error "Module export for '$ModuleId' failed with status code $($Response.StatusCode)." + exit 1 + } + + $ModuleXml = New-Object xml + $ModuleXml.LoadXml(($Response.Content | ConvertFrom-Json | Select-Object -ExpandProperty module)) + $ModuleTag = ((Select-Xml -Xml $ModuleXml -XPath "/EXT[@title='RWE2 - Modulo']/SECTION[1]/COL0001").Node.InnerText).Trim() + + if (-not $ModuleTag) { + Write-Error "Failed to extract module tag from the exported XML." + exit 1 + } + + if (-not $Quiet) { + Write-Host "Module ID '$ModuleId' corresponds to Module Tag '$ModuleTag'." + } + + $Response.Content | Out-File -FilePath (Join-Path $manualExportPath "elxforms_$($ModuleId).elx") -Encoding UTF8 + + if (-not $Quiet) { + Write-Host "Module export for '$ModuleId' completed successfully!" -ForegroundColor Green + Write-Host "Switching back to original directory..." + } + + $latestDownloadedFile = Get-ChildItem -Path $manualExportPath -Filter "*.elx" | Sort-Object LastWriteTime -Descending | Select-Object -First 1 + if (-not $latestDownloadedFile) { + Write-Error "No .elx file found in manual export directory '$manualExportPath'." + exit 1 + } + + $DestinationFolder = Join-Path -Path $ModulePath -ChildPath $ModuleTag + if (-not (Test-Path -Path $DestinationFolder)) { + New-Item -ItemType Directory -Path $DestinationFolder -Force | Out-Null + } + + if (-not $Quiet) { + Write-Host "Moving exported module file '$($latestDownloadedFile.Name)' to destination '$DestinationFolder'..." + } + + Move-Item -Path $latestDownloadedFile.FullName -Destination (Join-Path $DestinationFolder $latestDownloadedFile.Name) -Force + + $ModuleTag + } + finally { + Pop-Location -StackName ManualExport + } +} + function Convert-UrlToElixAutocompleteFormat { param ( [Parameter(Mandatory)][ValidateNotNullOrEmpty()][uri]$AbsoluteUrl @@ -194,5 +280,6 @@ function Convert-UrlToElixAutocompleteFormat { Export-ModuleMember -Function Convert-UrlToElixAutocompleteFormat Export-ModuleMember -Function Save-ElxInternals -Export-ModuleMember -Function Export-ElxModule +Export-ModuleMember -Function Export-ElxModuleManual +Export-ModuleMember -Function Export-ElxModuleSelenium Export-ModuleMember -Function New-EnvFileContent \ No newline at end of file diff --git a/scripts/export-elx.ps1 b/scripts/export-elx.ps1 index 1873b52..cfe4f22 100644 --- a/scripts/export-elx.ps1 +++ b/scripts/export-elx.ps1 @@ -1,6 +1,6 @@ [CmdletBinding()] param( - [Parameter(Mandatory)][ValidateNotNullOrEmpty()][string]$ModuleTag + [Parameter(Mandatory)][ValidateNotNullOrEmpty()][string]$ModuleId ) $psVersion = $PSVersionTable.PSVersion @@ -10,19 +10,21 @@ if ($psVersion.Major -lt 7 -or ($psVersion.Major -eq 7 -and $psVersion.Minor -lt } Write-Host "Checking module folder existence..." -$modulesSrcPath = Join-Path $PSScriptRoot "../src/$ModuleTag" +$modulesSrcPath = Join-Path $PSScriptRoot "../src" if (-not (Test-Path -Path $modulesSrcPath)) { - Write-Host "Module folder not found. Creating folder for module tag '$ModuleTag'..." -ForegroundColor Yellow + Write-Host "Module folder not found. Creating folder for module '$ModuleId'..." -ForegroundColor Yellow New-Item -ItemType Directory -Path $modulesSrcPath -Force | Out-Null } -$modulesSrcPath = Join-Path -Resolve $PSScriptRoot "../src/$ModuleTag" +$modulesSrcPath = Join-Path -Resolve $PSScriptRoot "../src" -Write-Host "Module tag '$ModuleTag' will be exported to '$modulesSrcPath'" +Write-Host "Module '$ModuleId' will be exported to '$modulesSrcPath' in its own folder" Import-Module $(Join-Path (Split-Path -Parent $MyInvocation.MyCommand.Definition) "elx-tools-module.psm1") -Force -Write-Host "Exporting module tag '$ModuleTag' from elixForms..." +Write-Host "Exporting module '$ModuleId' from elixForms..." -Export-ElxModule -ModuleTag $ModuleTag -ModulePath $modulesSrcPath +$ModuleTag = (Export-ElxModuleManual -ModuleId $ModuleId -ModulePath $modulesSrcPath) -Write-Host "Module tag '$ModuleTag' exported successfully!" -ForegroundColor Green +Write-Host "Module '$ModuleId' exported successfully!" -ForegroundColor Green + +Return $ModuleTag \ No newline at end of file