init

2023-07-13 13:44:05 +02:00 · 2023-07-13 13:44:05 +02:00 · f268de21a3
commit f268de21a3
682 changed files with 135708 additions and 0 deletions
--- a/.git-hooks/commit-msg
+++ b/.git-hooks/commit-msg
@ -0,0 +1,18 @@
+#!/bin/sh
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+
+# Get the commit message (the parameter we're given is just the path to the
+# temporary file which holds the message).
+commit_message=$(cat "$1")
+
+if (echo "$commit_message" | grep -Eq "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9 \-]+\))?!?: .+$") then
+   echo "${GREEN} ✔ Commit message meets Conventional Commit standards"
+   exit 0
+fi
+
+echo "${RED}❌ Commit message does not meet the Conventional Commit standard!"
+echo "An example of a valid message is:"
+echo "  feat(login): add the 'remember me' button"
+echo "ℹ More details at: https://www.conventionalcommits.org/en/v1.0.0/#summary"
+exit 1
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Avoid commits to the master branch
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+REGEX="^(master|development)$"
+
+if [[ "$BRANCH" =~ $REGEX ]]; then
+  echo "You are on branch $BRANCH. Are you sure you want to commit to this branch?"
+  echo "If so, commit with -n to bypass the pre-commit hook."
+  exit 1
+fi
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@ -0,0 +1,38 @@
+name: Build
+run-name: Building and testing DC
+on: [pull_request]
+
+jobs:
+  Build-and-ng-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Write .npmrc file
+        run: echo "$NPMRC" > client/.npmrc
+        shell: bash
+        env:
+          NPMRC: ${{ secrets.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: npm run lint:check
+      # Install dependencies~
+      - run: npm ci --legacy-peer-deps
+      # Audit should fail and stop the CI if critical vulnerability found
+      - run: npm audit --audit-level=critical
+      - run: |
+          cd ./sas
+          npm audit --audit-level=critical
+      - run: |
+          cd ./client
+          npm audit --audit-level=critical
+          npm test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
+          npm run postinstall
+          npm run build
--- a/.gitea/workflows/development-test.yaml
+++ b/.gitea/workflows/development-test.yaml
@ -0,0 +1,172 @@
+name: Test
+run-name: Building and testing development branch
+on:
+  push:
+    branches:
+      - development
+
+jobs:
+  Build-and-test-development:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Write .npmrc file
+        run: echo "$NPMRC" > client/.npmrc
+        shell: bash
+        env:
+          NPMRC: ${{ secrets.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 libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+      - run: apt -y install jq
+      # - run: 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+      # - run: eval $(ssh-agent -s)
+      # - run: echo "$ssh_key" | tr -d '\r' | ssh-add -
+      - name: Write cypress credentials
+        run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
+        shell: bash
+        env:
+          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
+
+      # - run: mkdir -p ~/.ssh
+      # - run: chmod 700 ~/.ssh
+      - run: npm ci --legacy-peer-deps
+      # 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: echo "SERVER_URL=$server_url" >> .env
+      # - run: echo "SERVER_TYPE=$server_type" >> .env
+      # - run: echo "CLIENT=$client_sasjs" >> .env
+      # - run: echo "ACCESS_TOKEN=$access_token_sasjs" >> .env
+      # - run: echo "REFRESH_TOKEN=$refresh_token_sasjs" >> .env
+      # - run: cat .env
+      - run: pm2 start api-linux --wait-ready
+
+      - name: Deploy mocked services
+        run: |
+          cd ./sas/mocks/sasjs
+          npm install --legacy-peer-deps -g @sasjs/cli
+          npm install --legacy-peer-deps -g replace-in-files-cli
+          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: Prepare frontend
+        run: |
+          cd ./client
+          # mv ./cypress.env.example.json ./cypress.env.json
+          # replace-in-files --regex='"username".*' --replacement='"username":"'$cypress_username_sasjs'",' ./cypress.env.json
+          # replace-in-files --regex='"password".*' --replacement='"password":"'$cypress_pwd_sasjs'" ' ./cypress.env.json
+          cat ./cypress.env.json
+          npm run postinstall
+          # Prepare index.html to SASJS local
+          replace-in-files --regex='serverUrl=".*?"' --replacement='serverUrl="http://localhost:5000"' ./src/index.html
+          replace-in-files --regex='appLoc=".*?"' --replacement='appLoc="/Public/app/devtest"' ./src/index.html
+          replace-in-files --regex='serverType=".*?"' --replacement='serverType="SASJS"' ./src/index.html
+          # Prepare and deploy SASJS version
+          # replace-in-files --regex='serverurl=".*?"' --replacement='serverUrl="http://localhost:5000"' ./dist/index.html
+          # replace-in-files --regex='apploc=".*?"' --replacement='appLoc="/30.SASApps/app/devtest"' ./dist/index.html
+          # replace-in-files --regex='servertype=".*?"' --replacement='serverType="SASJS"' ./dist/index.html
+          # scp -o stricthostkeychecking=no -r ./dist/* dcgitlab@sas.4gl.io:/var/www/html/dcviya/development/newadapter
+          replace-in-files --regex='"hosturl".*' --replacement='hosturl:"http://localhost:4200",' ./cypress.config.ts
+          # replace-in-files --regex='"appLocation".*' --replacement='appLocation:"/dcviya/development/newadapter",' ./cypress.config.ts
+          cat ./cypress.config.ts
+          # Start frontend and run cypress
+          npm start & npx wait-on http://localhost:4200 && ./run-cypress-tests.sh
+
+  Build-and-test-development-latest-adapter:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Write .npmrc file
+        run: echo "$NPMRC" > client/.npmrc
+        shell: bash
+        env:
+          NPMRC: ${{ secrets.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 libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+      - run: apt -y install jq
+      # - run: 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+      # - run: eval $(ssh-agent -s)
+      # - run: echo "$ssh_key" | tr -d '\r' | ssh-add -
+      - name: Write cypress credentials
+        run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
+        shell: bash
+        env:
+          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
+
+      # - run: mkdir -p ~/.ssh
+      # - run: chmod 700 ~/.ssh
+      - run: npm ci --legacy-peer-deps
+      # 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: echo "SERVER_URL=$server_url" >> .env
+      # - run: echo "SERVER_TYPE=$server_type" >> .env
+      # - run: echo "CLIENT=$client_sasjs" >> .env
+      # - run: echo "ACCESS_TOKEN=$access_token_sasjs" >> .env
+      # - run: echo "REFRESH_TOKEN=$refresh_token_sasjs" >> .env
+      # - run: cat .env
+      - run: pm2 start api-linux --wait-ready
+
+      - name: Deploy mocked services
+        run: |
+          cd ./sas/mocks/sasjs
+          npm install --legacy-peer-deps -g @sasjs/cli
+          npm install --legacy-peer-deps -g replace-in-files-cli
+          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: Prepare frontend
+        run: |
+          cd ./client
+          # mv ./cypress.env.example.json ./cypress.env.json
+          # replace-in-files --regex='"username".*' --replacement='"username":"'$cypress_username_sasjs'",' ./cypress.env.json
+          # replace-in-files --regex='"password".*' --replacement='"password":"'$cypress_pwd_sasjs'" ' ./cypress.env.json
+          cat ./cypress.env.json
+          npm run postinstall
+          npm install --legacy-peer-deps @sasjs/adapter@latest
+          # Prepare index.html to SASJS local
+          replace-in-files --regex='serverUrl=".*?"' --replacement='serverUrl="http://localhost:5000"' ./src/index.html
+          replace-in-files --regex='appLoc=".*?"' --replacement='appLoc="/Public/app/devtest"' ./src/index.html
+          replace-in-files --regex='serverType=".*?"' --replacement='serverType="SASJS"' ./src/index.html
+          # Prepare and deploy SASJS version
+          # replace-in-files --regex='serverurl=".*?"' --replacement='serverUrl="http://localhost:5000"' ./dist/index.html
+          # replace-in-files --regex='apploc=".*?"' --replacement='appLoc="/30.SASApps/app/devtest"' ./dist/index.html
+          # replace-in-files --regex='servertype=".*?"' --replacement='serverType="SASJS"' ./dist/index.html
+          # scp -o stricthostkeychecking=no -r ./dist/* dcgitlab@sas.4gl.io:/var/www/html/dcviya/development/newadapter
+          replace-in-files --regex='"hosturl".*' --replacement='hosturl:"http://localhost:4200",' ./cypress.config.ts
+          # replace-in-files --regex='"appLocation".*' --replacement='appLocation:"/dcviya/development/newadapter",' ./cypress.config.ts
+          cat ./cypress.config.ts
+          # Start frontend and run cypress
+          npm start & npx wait-on http://localhost:4200 && ./run-cypress-tests.sh
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@ -0,0 +1,50 @@
+name: Release
+run-name: Releasing DC
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Write .npmrc file
+        run: |
+          echo "$NPMRC" > client/.npmrc
+          echo "legacy-peer-deps=true" >> client/.npmrc
+        shell: bash
+        env:
+          NPMRC: ${{ secrets.NPMRC}}
+
+      - name: Install ZIP
+        run: |
+          apt-get update
+          apt-get install zip
+
+      - name: release-build
+        run: |
+          cd client
+          npm ci
+          npm run build
+          zip -r dist.zip ./dist
+
+      - name: Install Semantic Release and plugins
+        run: |
+          npm i
+          npm i -g semantic-release
+
+      - name: Release
+        run: |
+          GITEA_TOKEN=${{ secrets.RELEASE_TOKEN }} GITEA_URL=https://git.datacontroller.io semantic-release
+
+      - name: Release Typedoc
+        run: |
+          cd client
+          npm run typedoc
+          # deploy docs
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,19 @@
+coverage/
+dist/
+node_modules/
+client/.angular/cache/
+**/*npm-debug.log.*
+**/*yarn-error.log.*
+.idea/
+.DS_Store
+client/src/environments/version.ts
+client/cypress/screenshots
+client/cypress/results
+client/cypress/videos
+cypress.env.json
+sasjsbuild
+sasjsresults
+.env*
+.sasjsrc
+client/.npmrc
+*~
--- a/.npmrc
+++ b/.npmrc
@ -0,0 +1 @@
+legacy-peer-deps=false
--- a/.prettierrc.json
+++ b/.prettierrc.json
@ -0,0 +1,8 @@
+
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "endOfLine": "auto"
+}
--- a/.releaserc
+++ b/.releaserc
@ -0,0 +1,22 @@
+{
+  "branches": ["main"],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/changelog",
+    [
+        "@semantic-release/git",
+        {
+            "assets": [
+                "CHANGELOG.md"
+            ]
+        }
+    ],
+    ["@saithodev/semantic-release-gitea", {
+      "giteaUrl": "https://git.datacontroller.io",
+      "assets": [
+        {"path": "client/dist.zip"}
+      ]
+    }]
+  ]
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,18 @@
+{
+    "cSpell.words": [
+        "SYSERRORTEXT",
+        "SYSWARNINGTEXT"
+    ],
+    "editor.rulers": [
+        80
+    ],
+    "files.trimTrailingWhitespace": true,
+    "[markdown]": {
+        "files.trimTrailingWhitespace": false
+    },
+    "workbench.colorCustomizations": {
+        "titleBar.activeForeground": "#ebe8e8",
+        "titleBar.activeBackground": "#95ff0053",
+    },
+    "terminal.integrated.wordSeparators": " ()[]{}',\"`─‘’"
+}
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -0,0 +1,9 @@
+pipeline:
+  build:
+    image: debian
+    commands:
+      - echo "This is the build step"
+  a-test-step:
+    image: debian
+    commands:
+      - echo "Testing.."
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,66 @@
+# Data Controller
+# Contributing
+
+## Dependencies that requires licences
+
+[SheetJS Pro Version](https://www.npmjs.com/package/sheetjs)
+
+
+To auth for SheetJS Pro version you need to use their private registry
+Add `client/.npmrc` file with following content:
+```
+@sheet:registry=https://pylon.sheetjs.com:54111/
+//pylon.sheetjs.com:54111/:_authToken="TOKEN-GOES-HERE"
+```
+
+[Handsontable](https://www.npmjs.com/package/handsontable)
+
+Licence should be inserted in the `client/src/index.html` file:
+
+```
+ <sasjs
+    ...
+    hotLicenceKey="LICENCE-GOES-HERE"
+>
+</sasjs>
+```
+## Development
+Update `client/src/index.html` so that it points to your SAS9, SASVIYA or SASJS backend.  
+Be aware that VIYA can be configured in such way that it would not work with cross origin frontend.  
+Follow this guide to disable CORS: https://sasjs.io/cors/ (NOTICE: Sometimes even this approach would fail to work, in such case it is imposible to set it up without reconfiguring the VIYA server)  
+
+Start dev server:
+```
+cd client
+
+npm start
+```
+
+## GUI Elements
+
+For documentation on the Clarity Design System, including a list of components and example usage, see [our website](https://vmware.github.io/clarity).
+
+## Code style
+Run prettier fix:
+```bash
+npm run lint:fix
+```
+
+## Generate docs
+Typedoc is used for generating typescript documentation based on the code.
+That part is automated and beign done as a part of CI job.
+
+# Troubleshooting
+
+## Makedata service "could not create directory" error
+
+The dcpath folder should have its permissions set so that the system account (SYSUSERID) can both read and write to it.
+
+Example:
+
+If dcpath is: '/tmp/dc'
+
+Run:
+```
+chmod 777 /tmp/dc
+```
--- a/LICENCE.md
+++ b/LICENCE.md
@ -0,0 +1,27 @@
+Licence Agreement for Data Controller for SAS®
+====================
+
+Copyright (c) Bowe IO Ltd
+
+Data Controller is a software distributed by 4GL Apps, a brand owned by Bowe IO Ltd, a UK Limited Company headquarted in 29 Oldfield Rd, Cumbria, registered by companies house under number 08777171, VAT number: 203914240
+
+This software is protected by applicable copyright laws, including international treaties, and dual-
+licensed – depending on whether your use for commercial purposes, meaning intended for or
+resulting in commercial advantage or monetary compensation, or not.
+
+If your use is strictly personal or solely for evaluation purposes, meaning for the purposes of testing
+the suitability, performance, and usefulness of this software outside the production environment,
+you agree to be bound by the terms included in the "licence-non-commercial-datacontroller.md" file.
+
+Your use of this software for commercial purposes is subject to the terms included in an applicable
+license agreement.
+
+In any case, you must not make any such use of this software as to develop software which may be
+considered competitive with this software.
+
+UNLESS EXPRESSLY AGREED OTHERWISE, 4GL APPS PROVIDES THIS SOFTWARE ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, AND IN NO EVENT AND UNDER NO
+LEGAL THEORY, SHALL 4GL APPS BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM
+USE OR INABILITY TO USE THIS SOFTWARE.
+
--- a/README.md
+++ b/README.md
--- a/client/.dockerignore
+++ b/client/.dockerignore
@ -0,0 +1,14 @@
+.vscode/
+coverage/
+docs/
+html-report/
+node_modules/
+typings/
+**/*npm-debug.log.*
+**/*yarn-error.log.*
+.idea/
+.DS_Store
+cypress/screenshots
+cypress/videos
+.env*
+.sasjsrc
--- a/client/.editorconfig
+++ b/client/.editorconfig
@ -0,0 +1,16 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
--- a/client/.eslintrc.json
+++ b/client/.eslintrc.json
@ -0,0 +1,46 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "app",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "app",
+            "style": "kebab-case"
+          }
+        ]
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}
--- a/client/.hintrc
+++ b/client/.hintrc
@ -0,0 +1,5 @@
+{
+    "extends": [
+        "development"
+    ]
+}
--- a/client/.vscode/.editorconfig
+++ b/client/.vscode/.editorconfig
@ -0,0 +1,9 @@
+{
+  "search.exclude": {
+    "**/sasjsbuild/**": true,
+    "**/dist/**":true
+  },
+  "editor.insertSpaces": true,
+  "editor.tabSize": 2,
+  "trim_trailing_whitespace": true
+}
--- a/client/.vscode/launch.json
+++ b/client/.vscode/launch.json
@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "type": "chrome",
+        "request": "attach",
+        "name": "Launch Chrome",
+        "port": 9222,
+        "webRoot": "${workspaceFolder}"
+      }
+    ]
+}
--- a/client/.vscode/settings.json
+++ b/client/.vscode/settings.json
@ -0,0 +1,6 @@
+{
+  "files.trimTrailingWhitespace": true,
+  "editor.rulers": [
+    107
+  ]
+}
--- a/client/Dockerfile
+++ b/client/Dockerfile
@ -0,0 +1,13 @@
+FROM node:14-alpine as builder
+WORKDIR '/app'
+COPY ./package.json ./
+COPY ./package-lock.json ./
+COPY ./.npmrc ./
+RUN npm i
+COPY . .
+RUN npm run build
+
+FROM nginx
+EXPOSE 3000
+COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=builder /app/dist /usr/share/nginx/html
--- a/client/Dockerfile.dev
+++ b/client/Dockerfile.dev
@ -0,0 +1,8 @@
+FROM node:14-alpine
+WORKDIR '/app'
+COPY ./package.json ./
+COPY ./package-lock.json ./
+COPY ./.npmrc ./
+RUN npm i
+COPY . .
+CMD ["npm", "run", "start"]
--- a/client/angular.json
+++ b/client/angular.json
@ -0,0 +1,169 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "cli": {
+    "analytics": false
+  },
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "datacontroller": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        },
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "allowedCommonJsDependencies": [
+              "handsontable",
+              "core-js",
+              "pikaday",
+              "querystring",
+              "punycode",
+              "url",
+              "rxjs",
+              "rxjs-compat",
+              "d3-graphviz",
+              "save-svg-as-png",
+              "@sheet/perf",
+              "@sheet/crypto",
+              "iconv-lite",
+              "buffer/",
+              "zone.js",
+              "text-encoding",
+              "crypto-js/md5",
+              "buffer",
+              "numbro",
+              "@clr/icons",
+              "@sasjs/adapter",
+              "@sasjs/utils/input/validators",
+              "@sasjs/utils/utils/bytesToSize",
+              "base64-arraybuffer",
+              "@handsontable/formulajs"
+            ],
+            "polyfills": [
+              "src/polyfills.ts",
+              "zone.js"
+            ],
+            "outputPath": "dist",
+            "resourcesOutputPath": "images",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "tsConfig": "tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/images"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": [
+              "node_modules/@clr/icons/clr-icons.min.js",
+              "node_modules/marked/marked.min.js"
+            ]
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "13mb",
+                  "maximumError": "15mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "7kb",
+                  "maximumError": "10kb"
+                }
+              ],
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "outputHashing": "all",
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              }
+            },
+            "development": {
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "buildOptimizer": false,
+              "sourceMap": true,
+              "optimization": false,
+              "namedChunks": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "browserTarget": "datacontroller:build:production"
+            },
+            "development": {
+              "browserTarget": "datacontroller:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "datacontroller:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "tsConfig": "tsconfig.spec.json",
+            "inlineStyleLanguage": "scss",
+            "codeCoverage": true,
+            "polyfills": [
+              "src/polyfills.ts",
+              "zone.js",
+              "zone.js/testing"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": [
+
+            ],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "karmaConfig": "karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
+          }
+        }
+      }
+    }
+  }
+}
--- a/client/cypress.config.ts
+++ b/client/cypress.config.ts
@ -0,0 +1,28 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  reporter: 'mochawesome',
+  reporterOptions: {
+    reportDir: 'cypress/results',
+    overwrite: false,
+    html: true,
+    json: false,
+  },
+  chromeWebSecurity: false,
+  defaultCommandTimeout: 30000,
+  env: {
+    hosturl:"http://localhost:4200",
+    appLocation: "",
+    site_id_SAS9: "70221618",
+    site_id_SASVIYA: "70253615",
+    site_id_SASJS: "123",
+    serverType: "SASJS",
+    libraryToOpenIncludes_SASVIYA: "viya",
+    libraryToOpenIncludes_SAS9: "dc",
+    libraryToOpenIncludes_SASJS: "dc",
+    debug: false,
+    screenshotOnRunFailure: false,
+    longerCommandTimeout: 50000,
+    testLicenceUserLimits: false
+  }
+})
--- a/client/cypress.env.example.json
+++ b/client/cypress.env.example.json
@ -0,0 +1,4 @@
+{
+	"username": "sas_username",
+	"password": "sas_password"
+}
--- a/client/cypress/fixtures/example.json
+++ b/client/cypress/fixtures/example.json
@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}
--- a/client/cypress/fixtures/excels/15mb_excel.xlsx
+++ b/client/cypress/fixtures/excels/15mb_excel.xlsx
--- a/client/cypress/fixtures/excels/5mb_excel.xlsx
+++ b/client/cypress/fixtures/excels/5mb_excel.xlsx
--- a/client/cypress/fixtures/excels/7th_tab_excel.xlsx
+++ b/client/cypress/fixtures/excels/7th_tab_excel.xlsx
--- a/client/cypress/fixtures/excels/MPE_DATADICTIONARY_composite_keys.xlsx
+++ b/client/cypress/fixtures/excels/MPE_DATADICTIONARY_composite_keys.xlsx
--- a/client/cypress/fixtures/excels/MPE_DATADICTIONARY_merged_cells.xlsx
+++ b/client/cypress/fixtures/excels/MPE_DATADICTIONARY_merged_cells.xlsx
--- a/client/cypress/fixtures/excels/MPE_DATADICTIONARY_missing_row.xlsx
+++ b/client/cypress/fixtures/excels/MPE_DATADICTIONARY_missing_row.xlsx
--- a/client/cypress/fixtures/excels/blank_column_with_header.xlsx
+++ b/client/cypress/fixtures/excels/blank_column_with_header.xlsx
--- a/client/cypress/fixtures/excels/blank_columns_excel.xlsx
+++ b/client/cypress/fixtures/excels/blank_columns_excel.xlsx
--- a/client/cypress/fixtures/excels/duplicate_column_excel.xlsx
+++ b/client/cypress/fixtures/excels/duplicate_column_excel.xlsx
--- a/client/cypress/fixtures/excels/duplicate_row_excel.xlsx
+++ b/client/cypress/fixtures/excels/duplicate_row_excel.xlsx
--- a/client/cypress/fixtures/excels/extra_column_excel.xlsx
+++ b/client/cypress/fixtures/excels/extra_column_excel.xlsx
--- a/client/cypress/fixtures/excels/formulas_excel.bak
+++ b/client/cypress/fixtures/excels/formulas_excel.bak
--- a/client/cypress/fixtures/excels/formulas_excel.xlsx
+++ b/client/cypress/fixtures/excels/formulas_excel.xlsx
--- a/client/cypress/fixtures/excels/missing_columns_excel.xlsx
+++ b/client/cypress/fixtures/excels/missing_columns_excel.xlsx
--- a/client/cypress/fixtures/excels/mixed_content_excel.xlsx
+++ b/client/cypress/fixtures/excels/mixed_content_excel.xlsx
--- a/client/cypress/fixtures/excels/nodata_rows_excel.xlsx
+++ b/client/cypress/fixtures/excels/nodata_rows_excel.xlsx
--- a/client/cypress/fixtures/excels/regular_excel.xlsx
+++ b/client/cypress/fixtures/excels/regular_excel.xlsx
--- a/client/cypress/fixtures/excels/regular_excel_macro.xlsm
+++ b/client/cypress/fixtures/excels/regular_excel_macro.xlsm
--- a/client/cypress/fixtures/excels/regular_excel_with_delete.bak
+++ b/client/cypress/fixtures/excels/regular_excel_with_delete.bak
--- a/client/cypress/fixtures/excels/regular_excel_with_delete.xlsx
+++ b/client/cypress/fixtures/excels/regular_excel_with_delete.xlsx
--- a/client/cypress/fixtures/excels/regular_excel_xls.xls
+++ b/client/cypress/fixtures/excels/regular_excel_xls.xls
--- a/client/cypress/fixtures/excels/surrounded_data_all_cells_empty_excel.xlsx
+++ b/client/cypress/fixtures/excels/surrounded_data_all_cells_empty_excel.xlsx
--- a/client/cypress/fixtures/excels/surrounded_data_empty_cells_excel.xlsx
+++ b/client/cypress/fixtures/excels/surrounded_data_empty_cells_excel.xlsx
--- a/client/cypress/fixtures/excels/surrounded_data_excel.xlsx
+++ b/client/cypress/fixtures/excels/surrounded_data_excel.xlsx
--- a/client/cypress/fixtures/excels_general/MPE_DATADICTIONARY_duplicate_keys.xlsx
+++ b/client/cypress/fixtures/excels_general/MPE_DATADICTIONARY_duplicate_keys.xlsx
--- a/client/cypress/integration/download.tests.ts
+++ b/client/cypress/integration/download.tests.ts
@ -0,0 +1,255 @@
+const username = Cypress.env('username')
+const password = Cypress.env('password')
+const hostUrl = Cypress.env('hosturl')
+const appLocation = Cypress.env('appLocation')
+const longerCommandTimeout = Cypress.env('longerCommandTimeout')
+const serverType = Cypress.env('serverType')
+const libraryToOpenIncludes = Cypress.env(`libraryToOpenIncludes_${serverType}`)
+const fixturePath = 'excels_general/'
+const downloadsFolder = Cypress.config('downloadsFolder')
+
+import { deleteDownloadsFolder } from '../util/deleteDownloadFolder'
+
+context('download files test: ', function () {
+  this.beforeAll(() => {
+    cy.visit(`${hostUrl}/SASLogon/logout`)
+    cy.loginAndUpdateValidKey()
+  })
+
+  this.beforeEach(() => {
+    cy.visit(hostUrl + appLocation)
+    cy.get('input.username').type(username)
+    cy.get('input.password').type(password)
+    cy.get('.login-group button').click()
+
+    visitPage('home')
+  })
+
+  this.afterEach(() => {
+    deleteDownloadsFolder()
+  })
+
+  it('1 | downloads audit file', (done) => {
+    visitPage('approve/toapprove')
+
+    cy.get('.app-loading', { timeout: longerCommandTimeout })
+      .should('not.exist')
+      .then(() => {
+        cy.get('.btn.btn-success')
+          .should('be.visible')
+          .then((buttons) => {
+            buttons[0].click()
+            const id = buttons[0].id
+
+            checkForFileDownloaded(id, 'zip', () => done())
+          })
+      })
+  })
+
+  it('2 | downloads viewer csv', (done) => {
+    visitPage('view/data')
+
+    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+
+    openDownloadModal(() => {
+      cy.get('select')
+        .select('CSV')
+        .then(() => {
+          cy.get('.btn.btn-sm.btn-success-outline').then((button) => {
+            button.trigger('click')
+
+            const id = button[0].id
+
+            checkForFileDownloaded(id, 'csv', () => done())
+          })
+        })
+    })
+  })
+
+  it('3 | downloads viewer excel', (done) => {
+    visitPage('view/data')
+
+    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+
+    openDownloadModal(() => {
+      cy.get('select')
+        .select('Excel')
+        .then(() => {
+          cy.get('.btn.btn-sm.btn-success-outline').then((button) => {
+            button.trigger('click')
+
+            const id = button[0].id
+
+            checkForFileDownloaded(id, 'xlsx', () => done())
+          })
+        })
+    })
+  })
+
+  it('4 | downloads viewer SAS Datalines', (done) => {
+    visitPage('view/data')
+
+    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+
+    openDownloadModal(() => {
+      cy.get('select')
+        .select('SAS Datalines')
+        .then(() => {
+          cy.get('.btn.btn-sm.btn-success-outline').then((button) => {
+            button.trigger('click')
+
+            const id = button[0].id
+
+            checkForFileDownloaded(id, 'sas', () => done())
+          })
+        })
+    })
+  })
+
+  it('5 | downloads viewer SAS DDL', (done) => {
+    visitPage('view/data')
+
+    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+
+    openDownloadModal(() => {
+      cy.get('select')
+        .select('SAS DDL')
+        .then(() => {
+          cy.get('.btn.btn-sm.btn-success-outline').then((button) => {
+            button.trigger('click')
+
+            const id = button[0].id
+
+            checkForFileDownloaded(id, 'ddl', () => done(), '_')
+          })
+        })
+    })
+  })
+
+  it('6 | downloads viewer TSQL DDL', (done) => {
+    visitPage('view/data')
+
+    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+
+    openDownloadModal(() => {
+      cy.get('select')
+        .select('TSQL DDL')
+        .then(() => {
+          cy.get('.btn.btn-sm.btn-success-outline').then((button) => {
+            button.trigger('click')
+
+            const id = button[0].id
+
+            checkForFileDownloaded(id, 'ddl', () => done(), '_')
+          })
+        })
+    })
+  })
+
+  it('7 | downloads viewer PGSQL DDL', (done) => {
+    visitPage('view/data')
+
+    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+
+    openDownloadModal(() => {
+      cy.get('select')
+        .select('PGSQL DDL')
+        .then(() => {
+          cy.get('.btn.btn-sm.btn-success-outline').then((button) => {
+            button.trigger('click')
+
+            const id = button[0].id
+
+            checkForFileDownloaded(id, 'ddl', () => done(), '_')
+          })
+        })
+    })
+  })
+
+  this.afterEach(() => {
+    cy.visit(`${hostUrl}/SASLogon/logout`)
+  })
+
+  this.afterAll(() => {
+    cy.visit(`https://sas.4gl.io/mihmed/cypress_finish`)
+  })
+})
+
+const visitPage = (url: string) => {
+  cy.visit(`${hostUrl}${appLocation}/#/${url}`)
+}
+
+const checkForFileDownloaded = (
+  id: string,
+  extension: string,
+  callback?: any,
+  libDivider: string = '.'
+) => {
+  cy.on('url:changed', (newUrl) => {
+    console.log('newUrl', newUrl)
+  })
+
+  id = id.replace('.', libDivider)
+
+  const filename = downloadsFolder + '/' + id + '.' + extension
+  // browser might take a while to download the file,
+  // so use "cy.readFile" to retry until the file exists
+  // and has length - and we assume that it has finished downloading then
+  cy.readFile(filename, { timeout: longerCommandTimeout })
+    .should('have.length.gt', 10)
+    .then((file) => {
+      if (callback) callback()
+    })
+}
+
+const openDownloadModal = (callback?: any) => {
+  cy.get('.btn.btn-sm.btn-outline.filterSide.dropdown-toggle')
+    .click()
+    .then(() => {
+      cy.get('clr-dropdown-menu button').then((buttons) => {
+        for (let button of buttons) {
+          if (button.innerText.toLowerCase().includes('download')) {
+            button.click()
+
+            if (callback) callback()
+          }
+        }
+      })
+    })
+}
+
+const openTableFromTree = (libNameIncludes: string, tablename: string) => {
+  cy.get('.app-loading', { timeout: longerCommandTimeout })
+    .should('not.exist')
+    .then(() => {
+      cy.get('.nav-tree clr-tree > clr-tree-node', {
+        timeout: longerCommandTimeout
+      }).then((treeNodes: any) => {
+        let viyaLib
+
+        for (let node of treeNodes) {
+          if (node.innerText.toLowerCase().includes(libNameIncludes)) {
+            viyaLib = node
+            break
+          }
+        }
+
+        console.log('viyaLib', viyaLib)
+
+        cy.get(viyaLib).within(() => {
+          cy.get(
+            '.clr-tree-node-content-container .clr-treenode-content p'
+          ).click()
+
+          cy.get('.clr-treenode-link').then((innerNodes: any) => {
+            for (let innerNode of innerNodes) {
+              if (innerNode.innerText.toLowerCase().includes(tablename)) {
+                innerNode.click()
+                break
+              }
+            }
+          })
+        })
+      })
+    })
+}
--- a/client/cypress/integration/editor.tests.ts
+++ b/client/cypress/integration/editor.tests.ts
@ -0,0 +1,257 @@
+const username = Cypress.env('username')
+const password = Cypress.env('password')
+const hostUrl = Cypress.env('hosturl')
+const appLocation = Cypress.env('appLocation')
+const longerCommandTimeout = Cypress.env('longerCommandTimeout')
+const serverType = Cypress.env('serverType')
+const libraryToOpenIncludes = Cypress.env(`libraryToOpenIncludes_${serverType}`)
+const fixturePath = 'excels_general/'
+
+context('editor tests: ', function () {
+  this.beforeAll(() => {
+    cy.visit(`${hostUrl}/SASLogon/logout`)
+    cy.loginAndUpdateValidKey()
+  })
+
+  this.beforeEach(() => {
+    cy.visit(hostUrl + appLocation)
+    // cy.get('input.username').type(username)
+    // cy.get('input.password').type(password)
+    // cy.get('.login-group button').click()
+
+    visitPage('home')
+  })
+
+  it('1 | Submits duplicate primary keys', (done) => {
+    openTableFromTree(libraryToOpenIncludes, 'mpe_datadictionary')
+
+    attachExcelFile('MPE_DATADICTIONARY_duplicate_keys.xlsx', () => {
+      clickOnUploadPreview(() => {
+        confirmEditPreviewFile(() => {
+          submitTable(() => {
+            cy.get('.modal-body').then((modalBody: any) => {
+              if (modalBody[0].innerText.includes(`Duplicates found:`)) {
+                done()
+              }
+            })
+          })
+        })
+      })
+    })
+  })
+
+  it('2 | Submits null cells which must not be null', (done) => {
+    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+
+    clickOnEdit(() => {
+      cy.get('.btn.btn-sm.btn-icon.btn-outline-danger', {
+        timeout: longerCommandTimeout
+      }).then(() => {
+        cy.get('.ht_master tbody tr').then((rows: any) => {
+          cy.get(rows[1].childNodes[2])
+            .dblclick({ force: true })
+            .then(() => {
+              cy.focused()
+                .clear()
+                .type('{enter}')
+                .then(() => {
+                  submitTable(() => {
+                    cy.get('.modal-body').then((modalBody: any) => {
+                      if (
+                        modalBody[0].innerHTML
+                          .toLowerCase()
+                          .includes(`invalid values are present`)
+                      ) {
+                        done()
+                      }
+                    })
+                  })
+                })
+            })
+        })
+      })
+    })
+  })
+
+  it('3 | Gets basic dynamic cell validation', () => {
+    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+
+    clickOnEdit(() => {
+      cy.get('.btn.btn-sm.btn-icon.btn-outline-danger', {
+        timeout: longerCommandTimeout
+      }).then(() => {
+        cy.get('.ht_master tbody tr').then((rows: any) => {
+          cy.get(rows[1].childNodes[5])
+            .click({ force: true })
+            .then(($td) => {
+              cy.get('.htAutocompleteArrow', { withinSubject: $td }).should(
+                'exist'
+              )
+            })
+        })
+      })
+    })
+  })
+
+  it('4 | Gets advanced dynamic cell validation', () => {
+    openTableFromTree(libraryToOpenIncludes, 'mpe_tables')
+
+    clickOnEdit(() => {
+      cy.get('.btn.btn-sm.btn-icon.btn-outline-danger', {
+        timeout: longerCommandTimeout
+      }).then(() => {
+        cy.get('.ht_master tbody tr').then((rows: any) => {
+          cy.get(rows[1].childNodes[3])
+            .click({ force: true })
+            .then(($td) => {
+              cy.get('.htAutocompleteArrow', { withinSubject: $td }).should(
+                'exist'
+              )
+              cy.get('.htAutocompleteArrow', {
+                withinSubject: rows[1].childNodes[7]
+              }).should('exist')
+              cy.get('.htAutocompleteArrow', {
+                withinSubject: rows[1].childNodes[8]
+              }).should('exist')
+            })
+        })
+      })
+    })
+  })
+
+  this.afterEach(() => {
+    // cy.visit(`${hostUrl}/SASLogon/logout`)
+  })
+})
+
+const clickOnEdit = (callback?: any) => {
+  cy.get('.btnCtrl button.btn-primary', { timeout: longerCommandTimeout })
+    .click()
+    .then(() => {
+      if (callback) callback()
+    })
+}
+
+const openTableFromTree = (libNameIncludes: string, tablename: string) => {
+  cy.get('.app-loading', { timeout: longerCommandTimeout })
+    .should('not.exist')
+    .then(() => {
+      cy.get('.nav-tree clr-tree > clr-tree-node', {
+        timeout: longerCommandTimeout
+      }).then((treeNodes: any) => {
+        let viyaLib
+
+        for (let node of treeNodes) {
+          if (node.innerText.toLowerCase().includes(libNameIncludes)) {
+            viyaLib = node
+            break
+          }
+        }
+
+        cy.get(viyaLib).within(() => {
+          cy.get('.clr-tree-node-content-container > button').click()
+
+          cy.get('.clr-treenode-link').then((innerNodes: any) => {
+            for (let innerNode of innerNodes) {
+              if (innerNode.innerText.toLowerCase().includes(tablename)) {
+                innerNode.click()
+                break
+              }
+            }
+          })
+        })
+      })
+    })
+}
+
+const attachExcelFile = (excelFilename: string, callback?: any) => {
+  cy.get('.buttonBar button:last-child')
+    .click()
+    .then(() => {
+      cy.get('input[type="file"]#file-upload')
+        .attachFile(`/${fixturePath}/${excelFilename}`)
+        .then(() => {
+          cy.get('.modal-footer .btn.btn-primary').then((modalBtn) => {
+            modalBtn.click()
+            if (callback) callback()
+          })
+        })
+    })
+}
+
+const clickOnUploadPreview = (callback?: any) => {
+  cy.get('.buttonBar button.btn-primary.btn-upload-preview')
+    .click()
+    .then(() => {
+      if (callback) callback()
+    })
+}
+
+const confirmEditPreviewFile = (callback?: any) => {
+  cy.get('.modal-footer button.btn-success-outline')
+    .click()
+    .then(() => {
+      if (callback) callback()
+    })
+}
+
+const submitTable = (callback?: any) => {
+  cy.get('.btnCtrl button.btn-primary')
+    .click()
+    .then(() => {
+      if (callback) callback()
+    })
+}
+
+const submitTableMessage = (callback?: any) => {
+  cy.get('.modal-footer .btn.btn-sm.btn-success-outline')
+    .click()
+    .then(() => {
+      if (callback) callback()
+    })
+}
+
+const submitExcel = (callback?: any) => {
+  cy.get('.buttonBar button.preview-submit')
+    .click()
+    .then(() => {
+      if (callback) callback()
+    })
+}
+
+const rejectExcel = (callback?: any) => {
+  cy.get('button', { timeout: longerCommandTimeout })
+    .should('contain', 'Go to approvals screen')
+    .then((allButtons: any) => {
+      for (let approvalButton of allButtons) {
+        if (
+          approvalButton.innerText
+            .toLowerCase()
+            .includes('go to approvals screen')
+        ) {
+          approvalButton.click()
+          break
+        }
+      }
+
+      cy.get('button.btn-danger')
+        .should('exist')
+        .should('not.be.disabled')
+        .click()
+        .then(() => {
+          cy.get('.modal-footer button.btn-success-outline')
+            .click()
+            .then(() => {
+              cy.get('app-history')
+                .should('exist')
+                .then(() => {
+                  if (callback) callback()
+                })
+            })
+        })
+    })
+}
+
+const visitPage = (url: string) => {
+  cy.visit(`${hostUrl}${appLocation}/#/${url}`)
+}
--- a/client/cypress/integration/excel.tests.ts
+++ b/client/cypress/integration/excel.tests.ts
@ -0,0 +1,539 @@
+import { Callbacks } from 'cypress/types/jquery/index'
+
				`@ -0,0 +1,539 @@`
				`import { Callbacks } from 'cypress/types/jquery/index'`