chore: css tidy up preventing redundant scroll bar

chore: partial viya createFile testing
fix: improved Viya createFile to apply related properties
2026-01-03 18:50:05 +00:00 · 2025-11-21 09:37:28 +00:00 · 2025-11-21 09:36:01 +00:00 · 2025-11-20 13:00:34 +00:00
6 changed files with 225 additions and 210 deletions
--- a/.github/workflows/server-tests.yml
+++ b/.github/workflows/server-tests.yml
@@ -79,15 +79,14 @@ jobs:

      - name: Deploy sasjs-tests
        run: |
-          sudo apt install jq
+          npm install -g replace-in-files-cli
          cd sasjs-tests
-          jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
+          replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json
          npm i
-          jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-          jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-          jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-          jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
-
+          replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json
+          replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json
+          replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json
+          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json
          cat ./public/config.json

          npm run update:adapter
@@ -99,9 +98,9 @@ jobs:

      - name: Run cypress on sasjs
        run: |
-          jq '.env.sasjsTestsUrl |= "http://localhost:3000"' ./cypress.json > ./cypress.temp && mv ./cypress.temp ./cypress.json
-          jq '.env.username |= "${{ secrets.SASJS_USERNAME }}"' ./cypress.json > ./cypress.temp && mv ./cypress.temp ./cypress.json
-          jq '.env.password |= "${{ secrets.SASJS_PASSWORD }}"' ./cypress.json > ./cypress.temp && mv ./cypress.temp ./cypress.json
+          replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.json
+          replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json
+          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json
          cat ./cypress.json
          echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"

--- a/sasjs-tests/src/main.ts
+++ b/sasjs-tests/src/main.ts
@@ -22,6 +22,7 @@ import { sendArrTests, sendObjTests } from './testSuites/RequestData'
 import { fileUploadTests } from './testSuites/FileUpload'
 import { computeTests } from './testSuites/Compute'
 import { sasjsRequestTests } from './testSuites/SasjsRequests'
+import { viyaFileTests } from './testSuites/ViyaFile'

 async function init() {
  const appContainer = document.getElementById('app')
@@ -103,9 +104,10 @@ function showTests(
    fileUploadTests(adapter)
  ]

-  // Add compute tests for SASVIYA only
+  // Add certain tests for SASVIYA only
  if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
    testSuites.push(computeTests(adapter, appLoc))
+    testSuites.push(viyaFileTests(adapter, appLoc))
  }

  container.innerHTML = ''
--- a/sasjs-tests/src/testSuites/ViyaFile.ts
+++ b/sasjs-tests/src/testSuites/ViyaFile.ts
@@ -0,0 +1,31 @@
+import SASjs from '@sasjs/adapter'
+import type { TestSuite } from '../types'
+
+export const viyaFileTests = (adapter: SASjs, appLoc: string): TestSuite => ({
+  name: 'SAS Viya File Tests',
+  tests: [
+    {
+      title: 'Create html file',
+      description: 'Should create an html file with appropriate properties',
+      test: async () => {
+        const fileContentBuffer = Buffer.from(
+          `<html>` +
+            `  <head><title>Test</title></head>` +
+            `  <body><p>This is a test</p></body>` +
+            `</html>`
+        )
+        // generate a timestamp string formatted as YYYYmmDDTHHMMSS_999
+        const timeMark = new Date()
+          .toISOString()
+          .replace(/(\/|:|\s|-|Z)/g, '')
+          .replace(/\./g, '_')
+        const filename = `viya_createFile_test_${timeMark}.html`
+        return adapter.createFile(filename, fileContentBuffer, appLoc)
+      },
+      assertion: () => {
+        //A test that returns a boolean
+        return true // dummy
+      }
+    }
+  ]
+})
--- a/src/SASViyaApiClient.ts
+++ b/src/SASViyaApiClient.ts
@@ -35,7 +35,7 @@ interface JobExecutionResult {
  log?: string
  error?: object
 }
-/* Viya /types/types?limit=999999 response structure */
+
 interface IViyaTypesResponse {
  accept: string
  count: number
@@ -47,7 +47,6 @@ interface IViyaTypesResponse {
  version: number
 }

-/* Item element within the Viya types response */
 interface IViyaTypesItem {
  description?: string
  extensions?: string[]
@@ -57,7 +56,7 @@ interface IViyaTypesItem {
  mappedTypes?: string[]
  mediaType?: string
  mediaTypes?: string[]
-  name?: string | undefined
+  name: string
  pluralLabel?: string
  properties?: IViyaTypesProperties
  resourceUri?: string
@@ -86,7 +85,7 @@ type IViyaTypesProperties = Record<string, string>
 * create and patch a new file.
 */
 interface IViyaTypesExtensionInfo {
-  typeDefName: string | undefined
+  typeDefName: string
  properties: IViyaTypesProperties | undefined
 }

@@ -115,9 +114,9 @@ export class SASViyaApiClient {
    this.requestClient
  )
  private folderMap = new Map<string, Job[]>()
+
  private fileExtensionMap = new Map<string, IViyaTypesExtensionInfo>()
-  private boolExtensionMap = false // required in case the map has zero entries
-  // after an attempt to populate it.
+  private boolExtensionMap = false // has the fileExtensionMap been populated yet?

  /**
   * A helper method used to call appendRequest method of RequestClient
@@ -491,11 +490,17 @@ export class SASViyaApiClient {
    const formData = new NodeFormData()
    formData.append('file', contentBuffer, fileName)

-    /** Query Viya for file metadata based on extension type. */
+    /** Query Viya for file metadata based on extension type.
+     *  Without providing certain properties, some versions of Viya will not
+     *  serve files as intended. Avoid this issue by applying the properties
+     *  that Viya has registered for a file extension.
+     */

-    // typeDefName - Viya accepts this property during the file creation
+    // typeDefName - Viya should automatically determine this and additional
+    // properties at runtime if not provided in the file creation request.
    let typeDefName: string | undefined = undefined
-    // Additional properties are supplied by a patch.
+    // Viya update 2025.09 resulted in a change to this automatic behaviour.
+    // We patch the new file to replicate the behaviour.
    let filePatch:
      | {
          name: string
@@ -524,14 +529,7 @@ export class SASViyaApiClient {
          .forEach((e) => {
            e.extensions?.forEach((ext) => {
              this.fileExtensionMap.set(ext, {
-                // `name` becomes the typeDefName value at file creation time.
-                // `name` is ignored here if it is not populated in the map, or
-                // has a blank/empty value.
-                typeDefName: e.name
-                  ? e.name.trim().length
-                    ? e.name.trim()
-                    : undefined
-                  : undefined,
+                typeDefName: e.name, // "name:" is the typeDefName value required for file creation.
                properties: e.properties
              })
            })
@@ -540,19 +538,17 @@ export class SASViyaApiClient {
        this.boolExtensionMap = true
      }

-      // Query the map for the current file extension
      const fileExtInfo = this.fileExtensionMap.get(fileExtension)
      if (fileExtInfo) {
-        // If the extension was found in the map, record the typeDefName and
-        // create a patch if a properties object was returned.
        typeDefName = fileExtInfo.typeDefName
        if (fileExtInfo.properties)
          filePatch = { name: fileName, properties: fileExtInfo.properties }
      }
    }

-    // Create the file
-    const createFileResponse = await this.requestClient.post<File>(
+    return (
+      await this.requestClient
+        .post<File>(
          `/files/files?parentFolderUri=${parentFolderUri}&typeDefName=${
            typeDefName ?? 'file'
          }#rawUpload`,
@@ -561,32 +557,23 @@ export class SASViyaApiClient {
          'multipart/form-data; boundary=' + (formData as any)._boundary,
          headers
        )
-
+        .then(async (res) => {
          // If a patch was created...
          if (filePatch) {
-      try {
-        const patchHeaders = {
-          Accept: 'application/json',
-          'If-Match': '*'
-        }
            // Get the URI of the newly created file
-        const fileUri = createFileResponse.result.links.filter(
+            const fileUri = res.result.links.filter(
              (e) => e.method == 'PATCH' && e.rel == 'patch'
            )[0].uri
            // and apply the patch
-        return (
-          await this.requestClient.patch<File>(
+            return await this.requestClient.patch<File>(
              `${fileUri}`,
              filePatch,
-            accessToken,
-            patchHeaders
+              accessToken
            )
+          }
+          return res
+        })
    ).result
-      } catch (e: any) {
-        throw new Error(`Error patching file ${fileName}.\n${e.message}`)
-      }
-    }
-    return createFileResponse.result
  }

  /**
--- a/src/request/RequestClient.ts
+++ b/src/request/RequestClient.ts
@@ -273,13 +273,9 @@ export class RequestClient implements HttpClient {
  public async patch<T>(
    url: string,
    data: any = {},
-    accessToken?: string,
-    overrideHeaders: { [key: string]: string | number } = {}
+    accessToken?: string
  ): Promise<{ result: T; etag: string }> {
-    const headers = {
-      ...this.getHeaders(accessToken, 'application/json'),
-      ...overrideHeaders
-    }
+    const headers = this.getHeaders(accessToken, 'application/json')

    return this.httpClient
      .patch<T>(url, data, { headers, withXSRFToken: true })
Author	SHA1	Message	Date
Trevor Moody	a3c5e985f7	chore: css tidy up preventing redundant scroll bar	2025-11-21 09:37:28 +00:00
Trevor Moody	68e0da8a91	chore: partial viya createFile testing	2025-11-21 09:36:01 +00:00
Trevor Moody	d0aaad024b	fix: improved Viya createFile to apply related properties	2025-11-20 13:00:34 +00:00