Merge pull request 'feat: enabling dclib switching when exporting config' (#220) from issue212 into main

Reviewed-on: #220

.gitea/workflows/build.yaml

@@ -2,32 +2,31 @@ name: Build
 run-name: Running Lint Check and Licence checker on Pull Request
 on: [pull_request]
 
+env:
+  NODE_VERSION: '24.5.0'
+
 jobs:
   Build-and-ng-test:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 24.5.0
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Install Google Chrome
         run: |
-          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-          echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
           apt-get update
-          apt-get install -y google-chrome-stable xvfb
+          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          apt install -y ./google-chrome*.deb
 
       - name: Write .npmrc file
-        run: echo "$NPMRC" > client/.npmrc
+        run: echo "$NPMRC" >> client/.npmrc
         shell: bash
         env:
           NPMRC: ${{ secrets.NPMRC}}
 
-      - name: Lint check
-        run: npm run lint:check
-
       - name: Install dependencies
         run: |
           cd client
@@ -35,6 +34,18 @@ jobs:
           echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
           npm ci
 
+      - name: Check audit
+        # Audit should fail and stop the CI if critical vulnerability found
+        run: |
+          npm audit --audit-level=critical --omit=dev
+          cd ./sas
+          npm audit --audit-level=critical --omit=dev
+          cd ../client
+          npm audit --audit-level=critical --omit=dev
+
+      - name: Lint check
+        run: npm run lint:check
+
       - name: Licence checker
         run: |
           cd client
@@ -52,26 +63,27 @@ jobs:
 
   Build-and-test-development:
     runs-on: ubuntu-latest
-    needs: Build-production-and-ng-test
+    needs: Build-and-ng-test
+    env:
+      CHROME_BIN: /usr/bin/google-chrome
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 24.5.0
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Write .npmrc file
         run: |
           touch client/.npmrc
           echo '${{ secrets.NPMRC}}' > client/.npmrc
 
-      - run: apt-get update
-      - run: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-      - run: apt install -y ./google-chrome*.deb;
-      - run: export CHROME_BIN=/usr/bin/google-chrome
-      - run: apt-get update -y
-      - run: apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb
-      - run: apt -y install jq
+      - name: Install system dependencies
+        run: |
+          apt-get update
+          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          apt install -y ./google-chrome*.deb
+          apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb jq zip
 
       - name: Write cypress credentials
         run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
@@ -86,17 +98,18 @@ jobs:
           echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
           npm ci
 
-      # Install pm2 and prepare SASJS server
-      - run: npm i -g pm2
-      - run: curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
-      - run: unzip linux.zip
-      - run: touch .env
-      - run: echo RUN_TIMES=js >> .env
-      - run: echo NODE_PATH=node >> .env
-      - run: echo CORS=enable >> .env
-      - run: echo WHITELIST=http://localhost:4200 >> .env
-      - run: cat .env
-      - run: pm2 start api-linux --wait-ready
+      - name: Setup and start SASjs server
+        run: |
+          npm i -g pm2
+          curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
+          unzip linux.zip
+          touch .env
+          echo RUN_TIMES=js >> .env
+          echo NODE_PATH=node >> .env
+          echo CORS=enable >> .env
+          echo WHITELIST=http://localhost:4200 >> .env
+          cat .env
+          pm2 start api-linux --wait-ready
 
       - name: Deploy mocked services
         run: |
@@ -106,11 +119,6 @@ jobs:
           sasjs cbd -t server-ci
           # sasjs request services/admin/makedata -t server-ci -d ./deploy/makeData4GL.json -c ./deploy/requestConfig.json -o ./output.json
 
-      - name: Install ZIP
-        run: |
-          apt-get update
-          apt-get install zip
-
       - name: Prepare and run frontend and cypress
         run: |
           cd ./client

.gitea/workflows/lighthouse.yaml

@@ -2,38 +2,31 @@ name: Lighthouse Checks
 run-name: Running Lighthouse Performance and Accessibility Checks on Pull Request
 on: [pull_request]
 
+env:
+  NODE_VERSION: '24.5.0'
+
 jobs:
   lighthouse:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [24.5.0]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Install Google Chrome
         run: |
-          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-          echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
           apt-get update
-          apt-get install -y google-chrome-stable xvfb
+          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          apt install -y ./google-chrome*.deb
 
-      - name: Install pm2 for process management
-        run: npm i -g pm2
+      - name: Install global packages
+        run: npm i -g pm2 @sasjs/cli wait-on
 
-      - name: Install @sasjs/cli
-        run: npm i -g @sasjs/cli
-
-      - name: Install wait-on globally
-        run: npm install -g wait-on
-
-      - name: Create .env file for sasjs/server
+      - name: Setup and start SASjs server
         run: |
           touch .env
           echo RUN_TIMES=js >> .env
@@ -41,15 +34,9 @@ jobs:
           echo CORS=enable >> .env
           echo WHITELIST=http://localhost:4200 >> .env
           cat .env
-
-      - name: Download sasjs/server package from github using curl
-        run: curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
-
-      - name: Unzip downloaded package
-        run: unzip linux.zip
-
-      - name: Run sasjs server
-        run: pm2 start api-linux --wait-ready
+          curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
+          unzip linux.zip
+          pm2 start api-linux --wait-ready
 
       - name: Write .npmrc file
         run: echo "$NPMRC" > client/.npmrc

.gitea/workflows/release.yaml

@@ -5,15 +5,20 @@ on:
     branches:
       - main
 
+env:
+  NODE_VERSION: '24.5.0'
+
 jobs:
   Build-production-and-ng-test:
     runs-on: ubuntu-latest
+    env:
+      CHROME_BIN: /usr/bin/google-chrome
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 24.5.0
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Write .npmrc file
         run: |
@@ -24,8 +29,7 @@ jobs:
         run: |
           apt-get update
           wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-          apt install -y ./google-chrome*.deb;
-          export CHROME_BIN=/usr/bin/google-chrome
+          apt install -y ./google-chrome*.deb
 
       - name: Write cypress credentials
         run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
@@ -43,9 +47,9 @@ jobs:
       - name: Check audit
         # Audit should fail and stop the CI if critical vulnerability found
         run: |
-          npm audit --audit-level=critical --omit=dev
+          npm audit --omit=dev
           cd ./sas
-          npm audit --audit-level=critical --omit=dev
+          npm audit --omit=dev
           cd ../client
           npm audit --audit-level=critical --omit=dev
 
@@ -63,25 +67,26 @@ jobs:
   Build-and-test-development:
     runs-on: ubuntu-latest
     needs: Build-production-and-ng-test
+    env:
+      CHROME_BIN: /usr/bin/google-chrome
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 24.5.0
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Write .npmrc file
         run: |
           touch client/.npmrc
           echo '${{ secrets.NPMRC}}' > client/.npmrc
 
-      - run: apt-get update
-      - run: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-      - run: apt install -y ./google-chrome*.deb;
-      - run: export CHROME_BIN=/usr/bin/google-chrome
-      - run: apt-get update -y
-      - run: apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb
-      - run: apt -y install jq
+      - name: Install system dependencies
+        run: |
+          apt-get update
+          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          apt install -y ./google-chrome*.deb
+          apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb jq zip
 
       - name: Write cypress credentials
         run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
@@ -96,17 +101,18 @@ jobs:
           echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
           npm ci
 
-      # Install pm2 and prepare SASJS server
-      - run: npm i -g pm2
-      - run: curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
-      - run: unzip linux.zip
-      - run: touch .env
-      - run: echo RUN_TIMES=js >> .env
-      - run: echo NODE_PATH=node >> .env
-      - run: echo CORS=enable >> .env
-      - run: echo WHITELIST=http://localhost:4200 >> .env
-      - run: cat .env
-      - run: pm2 start api-linux --wait-ready
+      - name: Setup and start SASjs server
+        run: |
+          npm i -g pm2
+          curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
+          unzip linux.zip
+          touch .env
+          echo RUN_TIMES=js >> .env
+          echo NODE_PATH=node >> .env
+          echo CORS=enable >> .env
+          echo WHITELIST=http://localhost:4200 >> .env
+          cat .env
+          pm2 start api-linux --wait-ready
 
       - name: Deploy mocked services
         run: |
@@ -116,11 +122,6 @@ jobs:
           sasjs cbd -t server-ci
           # sasjs request services/admin/makedata -t server-ci -d ./deploy/makeData4GL.json -c ./deploy/requestConfig.json -o ./output.json
 
-      - name: Install ZIP
-        run: |
-          apt-get update
-          apt-get install zip
-
       - name: Prepare and run frontend and cypress
         run: |
           cd ./client
@@ -155,10 +156,10 @@ jobs:
     needs: [Build-production-and-ng-test, Build-and-test-development]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 24.5.0
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Write .npmrc file
         run: |
@@ -168,17 +169,11 @@ jobs:
         env:
           NPMRC: ${{ secrets.NPMRC}}
 
-      - name: Install packages
+      - name: Install system packages
         run: |
           apt-get update
-          apt-get install zip -y
-          # sasjs cli is used to compile & build the SAS services
+          apt-get install -y zip jq doxygen
           npm i -g @sasjs/cli
-          # jq is used to parse the release JSON
-          apt-get install jq -y
-          # doxygen is used for the SASJS docs
-          apt-get update
-          apt-get install doxygen -y
 
       - name: Frontend Preliminary Build
         description: We want to prevent creating empty release if frontend fails

.npmrc

@@ -1 +1,3 @@
 legacy-peer-deps=true
+ignore-scripts=true
+save-exact=true

client/package-lock.json

@@ -37,7 +37,7 @@
         "hyperformula": "^2.5.0",
         "iconv-lite": "^0.5.0",
         "jquery-datetimepicker": "^2.5.21",
-        "jsrsasign": "^11.1.0",
+        "jsrsasign": "11.1.1",
         "marked": "^5.0.0",
         "moment": "^2.30.1",
         "ngx-clipboard": "^16.0.0",
@@ -18234,9 +18234,9 @@
       }
     },
     "node_modules/jsrsasign": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-11.1.0.tgz",
-      "integrity": "sha512-Ov74K9GihaK9/9WncTe1mPmvrO7Py665TUfUKvraXBpu+xcTWitrtuOwcjf4KMU9maPaYn0OuaWy0HOzy/GBXg==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-11.1.1.tgz",
+      "integrity": "sha512-6w95OOXH8DNeGxakqLndBEqqwQ6A70zGaky1oxfg8WVLWOnghTfJsc5Tknx+Z88MHSb1bGLcqQHImOF8Lk22XA==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/kjur/jsrsasign#donations"
@@ -25444,9 +25444,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
-      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
       "dev": true,
       "license": "MIT",
       "optional": true

client/package.json

@@ -67,7 +67,7 @@
     "hyperformula": "^2.5.0",
     "iconv-lite": "^0.5.0",
     "jquery-datetimepicker": "^2.5.21",
-    "jsrsasign": "^11.1.0",
+    "jsrsasign": "11.1.1",
     "marked": "^5.0.0",
     "moment": "^2.30.1",
     "ngx-clipboard": "^16.0.0",

sas/.npmrc

@@ -0,0 +1,2 @@
+ignore-scripts=true
+save-exact=true

sas/package-lock.json

@@ -6,8 +6,8 @@
     "": {
       "name": "dc-sas",
       "dependencies": {
-        "@sasjs/cli": "^4.15.0",
-        "@sasjs/core": "^4.62.0"
+        "@sasjs/cli": "4.15.2",
+        "@sasjs/core": "4.63.0"
       }
     },
     "node_modules/@asamuzakjp/css-color": {
@@ -251,13 +251,13 @@
       }
     },
     "node_modules/@sasjs/cli": {
-      "version": "4.15.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.15.0.tgz",
-      "integrity": "sha512-lVKzm8+4b9VSqbchfLnzyNm53cKDZfqSM8KU7izD/JDBsuATSZtjLo61iNenZaPg9d3WXglb1jf2ASbVKbXxUQ==",
+      "version": "4.15.2",
+      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.15.2.tgz",
+      "integrity": "sha512-lY9H+HIquLAPXuhk6ov/xyBooERvefT6oiwNRaQ6DHMMFE4cgPvrUH5s3RRkLI2+lET0M0hPPbuaZ4w9yFIDuA==",
       "license": "ISC",
       "dependencies": {
         "@sasjs/adapter": "4.16.3",
-        "@sasjs/core": "4.62.0",
+        "@sasjs/core": "4.63.0",
         "@sasjs/lint": "2.4.3",
         "@sasjs/utils": "3.5.6",
         "adm-zip": "0.5.10",
@@ -317,9 +317,9 @@
       }
     },
     "node_modules/@sasjs/core": {
-      "version": "4.62.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.62.0.tgz",
-      "integrity": "sha512-xMWeZbxlvuCP0B9fnSTgSFbSiA0hiKDpTua8wb0ghMUOl+dnh/XF+BYgrHhWhPL9j0+k5d8mJejLmf/l/txpzg==",
+      "version": "4.63.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.63.0.tgz",
+      "integrity": "sha512-NlIihA4BbP+mveAbb7A/hgnrZEpJKKIkq0v4SSDdYXg8YYdKAdyTK8K+6FNPwp+U6hixQCKVX8oCA1DIUppLqA==",
       "license": "MIT"
     },
     "node_modules/@sasjs/lint": {
@@ -1820,9 +1820,9 @@
       }
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "license": "MIT",
       "engines": {
         "node": ">=8.6"

sas/package.json

@@ -28,7 +28,7 @@
   },
   "private": true,
   "dependencies": {
-    "@sasjs/cli": "^4.15.0",
-    "@sasjs/core": "^4.62.0"
+    "@sasjs/cli": "4.15.2",
+    "@sasjs/core": "4.63.0"
   }
 }

sas/sasjs/services/admin/exportconfig.sas

@@ -9,10 +9,12 @@
   <h4> SAS Macros </h4>
   @li mf_getuser.sas
   @li mf_nobs.sas
-  @li mp_ds2cards.sas
   @li mp_abort.sas
   @li mp_binarycopy.sas
+  @li mp_ds2cards.sas
+  @li mp_ds2csv.sas
   @li mp_streamfile.sas
+  @li mp_validatecol.sas
 
   @author 4GL Apps Ltd
   @copyright 4GL Apps Ltd.  This code may only be used within Data Controller
@@ -21,23 +23,33 @@
 
 **/
 
+%global dclib islib newlib;
 %mpeinit()
+
+data _null_;
+  newlib=coalescec(symget('dclib'),"&mpelib");
+  %mp_validatecol(newlib,ISLIB,islib)
+  call symputx('islib',islib);
+  call symputx('newlib',upcase(newlib));
+  putlog (_all_)(=);
+run;
+
+%mp_abort(iftrue= (&islib ne 1)
+  ,mac=&_program
+  ,msg=%nrstr(&newlib is not a valid libref)
+)
+
 %let work=%sysfunc(pathname(work));
-
-/* excel does not work in all envs */
-%let mime=application/vnd.ms-excel;
-%let dbms=EXCEL;
-
 %let mime=application/csv;
 %let dbms=CSV;
 %let ext=csv;
 
 %macro conditional_export(ds);
 %if %mf_nobs(&ds)>0 %then %do;
-  PROC EXPORT DATA= &ds OUTFILE= "&work/&ds..&ext"
-    DBMS=&dbms REPLACE;
-  RUN;
-  ods package(ProdOutput) add file="&work/&ds..&ext" mimetype="&mime";
+  /* cannot use PROC EXPORT as we need to wrap all csv char values in quotes */
+  /* cannot use excel as it does not work consistently in all SAS envs */
+  %mp_ds2csv(&ds,outfile="&work/&newlib..&ds..csv",headerformat=NAME)
+  ods package(ProdOutput) add file="&work/&newlib..&ds..&ext" mimetype="&mime";
 %end;
 %mp_abort(iftrue= (&syscc ne 0)
   ,mac=&_program
@@ -52,6 +64,7 @@ data MPE_ALERTS;
   set &mpelib..MPE_ALERTS;
   where &dc_dttmtfmt. le tx_to;
   drop tx_: ;
+  if alert_lib="&mpelib" then alert_lib="&newlib";
 run;
 %conditional_export(MPE_ALERTS)
 
@@ -61,6 +74,7 @@ data MPE_COLUMN_LEVEL_SECURITY;
   where &dc_dttmtfmt. le tx_to;
   where also CLS_LIBREF ne "&mpelib";
   drop tx_: ;
+  CLS_LIBREF="&newlib";
 run;
 %conditional_export(MPE_COLUMN_LEVEL_SECURITY)
 
@@ -68,6 +82,7 @@ data MPE_CONFIG;
   set &mpelib..MPE_CONFIG;
   where &dc_dttmtfmt. le tx_to;
   drop tx_: ;
+  if var_name='DC_MACROS' then var_value=tranwrd(var_value,"&mpelib","&newlib");
 run;
 %conditional_export(MPE_CONFIG)
 
@@ -93,6 +108,7 @@ data MPE_EXCEL_CONFIG;
   set &mpelib..MPE_EXCEL_CONFIG;
   where &dc_dttmtfmt. le tx_to;
   drop tx_: ;
+  if xl_libref="&mpelib" then xl_libref="&newlib";
 run;
 %conditional_export(MPE_EXCEL_CONFIG)
 
@@ -107,6 +123,7 @@ data MPE_ROW_LEVEL_SECURITY;
   set &mpelib..MPE_ROW_LEVEL_SECURITY;
   where &dc_dttmtfmt. le tx_to;
   drop tx_: ;
+  if rls_libref="&mpelib" then rls_libref="&newlib";
 run;
 %conditional_export(MPE_ROW_LEVEL_SECURITY)
 
@@ -115,6 +132,7 @@ data MPE_SECURITY;
   set &mpelib..MPE_SECURITY;
   where &dc_dttmtfmt. le TX_TO;
   drop tx_: ;
+  if libref="&mpelib" then libref="&newlib";
 run;
 %conditional_export(MPE_SECURITY)
 
@@ -142,6 +160,23 @@ data MPE_VALIDATIONS;
 run;
 %conditional_export(MPE_VALIDATIONS)
 
+data MPE_XLMAP_INFO;
+  set &mpelib..MPE_XLMAP_INFO;
+  where &dc_dttmtfmt. le TX_TO;
+  drop tx_: ;
+  if XLMAP_TARGETLIBDS=:"&mpelib.." then
+    XLMAP_TARGETLIBDS=tranwrd(XLMAP_TARGETLIBDS,"&mpelib..","&newlib..");
+run;
+%conditional_export(MPE_XLMAP_INFO)
+
+data MPE_XLMAP_RULES;
+  set &mpelib..MPE_XLMAP_RULES;
+  where &dc_dttmtfmt. le TX_TO;
+  drop tx_: ;
+run;
+%conditional_export(MPE_XLMAP_RULES)
+
+
 /* finish up zip file */
 ods package(ProdOutput) publish archive properties
         (archive_name="DCBACKUP.zip" archive_path="&work");