fix: note about milliseconds

docs/dc-userguide.md

@@ -40,7 +40,7 @@ The Editor screen lets users who have been pre-authorised (via the `DATACTRL.MPE
 
 1 - *Filter*.  The user can filter before proceeding to perform edits.
 
-2 - *Upload*.  If you have a lot of data, you can [upload it directly](dcu-fileupload).  The changes are then approved in the usual way.
+2 - *Upload*.  If you have a lot of data, you can [upload it directly](files).  The changes are then approved in the usual way.
 
 3 - *Edit*.  This is the main interface, data is displayed in tabular format.  The first column is always "Delete?", as this allows you to mark rows for deletion.  Note that removing a row from display does not mark it for deletion!  It simply means that this row is not part of the changeset being submitted.
 The next set of columns are the Primary Key, and are shaded grey.  If the table has a surrogate / retained key, then it is the Business Key that is shown here (the RK field is calculated / updated at the backend).  For SCD2 type tables, the 'validity' fields are not shown.  It is assumed that the user is always working with the current version of the data, and the view is filtered as such.

docs/dcc-dates.md

@@ -2,7 +2,8 @@
 
 ## Overview
 
-Dates & datetimes are actually stored as plain numerics in regular SAS tables. In order for the Data Controller to recognise these values as dates / datetimes a format must be applied.
+Dates & datetimes are stored as plain numerics in regular SAS tables. In order for the Data Controller to recognise these values as dates / datetimes a format must be applied.
+
 
 ![displayed](img/dcc-dates1.png) ![source](img/dcc-dates2.png)
 
@@ -14,10 +15,12 @@ Supported date formats:
 * YYMMDD.
 * E8601DA.
 * B8601DA.
+* NLDATE.
 
 Supported datetime formats:
 
 * DATETIME.
+* NLDATM.
 
 Supported time formats:
 
@@ -34,7 +37,10 @@ proc metalib;
 run;
 ```
 
-If you have other dates / datetimes / times you would like us to support, do [get in touch](http://datacontroller.io/contact)!
+!!! note
+    Data Controller does not support decimals when EDITING.  For datetimes, this means that values must be rounded to 1 second (milliseconds are not supported).
+    
+If you have other dates / datetimes / times you would like us to support, do [get in touch](https://datacontroller.io/contact)!
 
 
 

docs/dcc-groups.md

@@ -14,4 +14,11 @@ By default, Data Controller will work with the SAS Groups defined in Viya, Metad
 
 ## Data Controller Admin Group
 
-When configuring Data Controller for the first time, a group is designated as the 'admin' group.  This group has unrestricted access to Data Controller.  To change this group, modify the `%let dc_admin_group=` entry in the settings program.  To prevent others from changing this group, ensure the containing folder is write-protected!
+When configuring Data Controller for the first time, a group is designated as the 'admin' group.  This group has unrestricted access to Data Controller.  To change this group, modify the `%let dc_admin_group=` entry in the settings program, located as follows:
+
+* **SAS Viya:**  $(appLoc)/services/settings.sas
+* **SAS 9:** $(appLoc)/services/public/Data_Controller_Settings
+* **SASjs Server:** $(appLoc)/services/public/settings.sas
+
+
+To prevent others from changing this group, ensure the Data Controller appLoc (deployment folder) is write-protected - eg RM (metadata) or using Viya Authorisation rules.

docs/dcc-options.md

@@ -27,6 +27,9 @@ By default, a maximum of 100 observations can be edited in the browser at one ti
 * Number (and size) of columns
 * Speed of client machine (laptop/desktop)
 
+### DC_REQUEST_LOGS
+On SASjs Server and SAS9 Server types, at the end of each DC SAS request, a record is added to the [MPE_REQUESTS](/tables/mpe_requests) table.  In some situations this can cause table locks.  To prevent this issue from occuring, the `DC_REQUEST_LOGS` option can be set to `NO` (Default is `YES`).
+
 ### DC_RESTRICT_EDITRECORD
 Setting YES will prevent the EDIT RECORD dialog appearing in the EDIT screen by removing the "Edit Row" option in the right click menu, and the "ADD RECORD" button in the bottom left.  
 

docs/dcc-tables.md

@@ -37,8 +37,8 @@ This is a required field.
 
 The loadtype determines the nature of the update to be applied. Valid values are as follows:
 
+- UPDATE. This is the most basic type - simply provide the primary key fields in the `BUSKEY` column.
 - FORMAT_CAT. For updating Format Catalogs, the BUSKEY should be `FMTNAME START`.  See [formats](/formats).
-- UPDATE. This is the most basic type, and any updates will happen 'in place'. Simply provide the primary key fields in the `BUSKEY` column.
 - TXTEMPORAL. This signifies an SCD2 type load. For this type the validity fields (valid from, valid to) should be specified in the `VAR_TXFROM` and `VAR_TXTO` fields. The table itself should include `VAR_TXFROM` in the physical key. The remainder of the primary key fields (not including `VAR_TXFROM`) should be specified in `BUSKEY`.
 - BITEMPORAL. These tables have two time dimensions - a version history, and a business history. The version history (SCD2) fields should be specified in `VAR_TXFROM` and `VAR_TXTO` and the business history fields should be specified in `VAR_BUSFROM` and `VAR_BUSTO`. Both the `VAR_TXFROM` and `VAR_BUSFROM` fields should be in the physical key of the actual table, but should NOT be specified in the `BUSKEY` field.
 - REPLACE. This loadtype simply deletes all the rows and appends the staged data.  Changes are NOT added to the audit table.  In the diff screen, previous rows are displayed as deleted, and staged rows as new (modified values are not displayed).  Can be useful for updating single-row tables.
@@ -48,6 +48,9 @@ This is a required field.
 !!! Note
     The support for BITEMPORAL loads is restricted, in the sense it is only possible to load data at a single point in time (no support for loading _multiple_ business date ranges for a _specific_ BUSKEY). The workaround is simply to load each date range separately. As a result of this restriction, the EDIT page will only show the latest business date range for each key.  To modify earlier values, a filter should be applied.
 
+!!! Warning
+    If your target table contains referential constraints (eg primary key values that are linked to a child table with a corresponding foreign key) then this will cause problems with the UPDATE and REPLACE load types.  This is due to the fact these both involve delete operations.  If removal of these constraints is not an option, the workaround would be to create a separate (mirror) table, and update that using PRE-EDIT and POST-APPROVE hook scripts.  Please contact Data Controller support for advice / assistance.
+
 ### BUSKEY
 
 The business (natural) key of the table. For SCD2 / Bitemporal, this does NOT include the validity dates. For Retained / Surrogate key tables, this contains the actual surrogate key - the underlying fields that are used to create the surrogate key are specified in [RK_UNDERLYING](#rk_underlying).
@@ -95,8 +98,8 @@ Leave blank if not required.
 
 SAS Developer Notes:
 
-* Target dataset: `work.STAGING_DS`
-* Base libref.table or catalog variable:  `&orig_libds`
+* Staged dataset: `work.STAGING_DS`
+* Target libref.table or catalog variable:  `&orig_libds`
 
 If your DQ check means that the program should not be submitted, then simply exit with `&syscc > 4`. You can even set a message to go back to the user by using the [mp_abort](https://core.sasjs.io/mp__abort_8sas.html) macro:
 
@@ -119,8 +122,8 @@ Leave blank if not required.
 
 SAS Developer Notes:
 
-* Target dataset: `work.STAGING_DS`
-* Base libref.table or catalog variable:  `&orig_libds`
+* Staged dataset: `work.STAGING_DS`
+* Target libref.table or catalog variable:  `&orig_libds`
 
 ### POST_APPROVE_HOOK
 
@@ -185,7 +188,7 @@ Leave blank unless using retained / surrogate keys.
 
 ### AUDIT_LIBDS
 
-If this field is blank (ie empty, missing), **every** change is captured in the [MPE_AUDIT](/tables/mpe_audit.md).  This can result in large data volumes for frequently changing tables.
+If this field is blank (ie empty, missing), **every** change is captured in the [MPE_AUDIT](/tables/mpe_audit).  This can result in large data volumes for frequently changing tables.
 
 Alternative options are:
 
@@ -216,3 +219,6 @@ To illustrate:
 
 * Physical filesystem (ends in .sas):  `/opt/sas/code/myprogram.sas`
 * Logical filesystem:  `/Shared Data/stored_processes/mydatavalidator`
+
+!!! warning
+    Do not place your hook scripts inside the Data Controller (logical) application folder, as they may be inadvertently lost during a deployment (eg in the case of a backup-and-deploy-new-instance approach).

docs/dci-deploysas9.md

@@ -22,15 +22,12 @@ The Stored Processes are deployed using a SAS Program.  This should be executed
 
 ```sas
 %let appLoc=/Shared Data/apps/DataController;  /* CHANGE THIS!! */
-filename dc url "https://git.datacontroller.io/dc/dc/releases/download/vX.X.X/sas9.sas; /* use correct release */
+%let serverName=SASApp;
+filename dc url "https://git.datacontroller.io/dc/dc/releases/download/latest/sas9.sas";
 %inc dc;
 ```
 
-If you don't have internet access from SAS, download `sas9.sas` from [here](https://git.datacontroller.io/dc/dc/releases), and change the `compiled_apploc` on line 2:  
-
-![](img/sas9_apploc.png)
-
-You can also change the `serverName` here, which is necessary if you are using any other logical server than `SASApp`.
+If you don't have internet access from SAS, download `sas9.sas` from [here](https://git.datacontroller.io/dc/dc/releases), and change the initial `compiled_apploc` and `compiled_serverName` macro variable assignments as necessary.
 
 #### 2 - Deploy the Frontend
 
@@ -39,10 +36,18 @@ The Data Controller frontend comes pre-built, and ready to deploy to the root of
 Deploy as follows:
 
 1.  Download the `frontend.zip` file from: [https://git.datacontroller.io/dc/dc/releases](https://git.datacontroller.io/dc/dc/releases)
-2. Unzip and place in the [htdocs folder of your SAS Web Server](https://sasjs.io/frontend-deployment/#sas9-deploy) - typically `!SASCONFIG/LevX/Web/WebServer/htdocs`.
-3. Open the `index.html` file and update the values for `appLoc` (per SAS code above) and `serverType` (to `SAS9`).
+2. Unzip and place in the [htdocs folder of your SAS Web Server](https://sasjs.io/frontend-deployment/#sas9-deploy) - typically a subdirectory of: `!SASCONFIG/LevX/Web/WebServer/htdocs`.
+3. Open the `index.html` file and update the values in the `<sasjs>` tag as follows:
 
-You can now open the app at `https://YOURWEBSERVER/unzippedfoldername` and follow the configuration steps (DC Physical Location and Admin Group) to complete deployment.
+  * `appLoc` - same as per SAS code in the section above
+  * `serverType` - change this to`SAS9` 
+  * `serverUrl` - Provide only if your SAS Mid Tier is on a different domain than the web server (protocol://SASMIDTIERSERVER:port)
+  * `loginMechanism` - set to `Redirected` if using SSO or 2FA
+  * `debug` - set to `true` to debug issues on startup (otherwise it's faster to leave it off and turn on in the application itself when needed)
+
+The remaining properties are not relevant for a SAS 9 deployment and can be **safely ignored**.
+
+You can now open the app at `https://YOURWEBSERVER/unzippedfoldername`  (step 2 above) and follow the configuration steps (DC Physical Location and Admin Group) to complete deployment.
 
 #### 3 - Run the Configurator
 
@@ -146,9 +151,35 @@ The items deployed to metadata include:
 
 We strongly recommend that the Data Controller configuration tables are stored in a database for concurrency reasons.
 
-We have customers in production using Oracle, Postgres, Netezza, SQL Server to name a few.  Contact us for support with DDL and migration steps for your chosen vendor.
+We have customers in production using Oracle, Postgres, Netezza, Redshift and SQL Server to name a few.  Contact us for support with DDL and migration steps for your chosen vendor.
 
 !!! note
     Data Controller does NOT modify schemas! It will not create or drop tables, or add/modify columns or attributes.  Only data _values_ (not the model) can be modified using this tool.
 
 To caveat the above - it is also quite common for customers to use a BASE engine library.  Data Controller ships with mechananisms to handle locking (internally) but it cannot handle external contentions, such as those caused when end users open datasets directly, eg with Enterprise Guide or Base SAS.
+
+
+## Redeployment
+
+The full redeployment process is as follows:
+
+* Back up metadata (export DC folder as SPK file)
+* Back up the physical tables in the DC library
+* Do a full deploy of a brand new instance of DC
+    - To a new metadata folder
+    - To a new frontend folder (if full deploy)
+* _Delete_ the **new** DC library (metadata + physical tables)
+* _Move_ the **old** DC library (metadata only) to the new DC metadata folder
+* Copy the _content_ of the old `services/public/Data_Controller_Settings` STP to the new one
+    - This will link the new DC instance to the old DC library / logs directory
+    - It will also re-apply any site-specific DC mods
+* Run any/all DB migrations between the old and new DC version
+    - See [migrations](https://git.datacontroller.io/dc/dc/src/branch/main/sas/sasjs/db/migrations) folder 
+* Test and make sure the new instance works as expected
+* Delete (or rename) the **old** instance 
+    - Metadata + frontend, NOT the underlying DC library data
+* Rename the new instance so it is the same as the old
+    - Both frontend and metadata
+* Run a smoke test to be sure everything works!
+
+If you are unfamiliar with, or unsure about, the above steps - don't hesitate to contact the Data Controller team for assistance and support.

docs/dci-troubleshooting.md

@@ -96,4 +96,10 @@ This can happen when importing with Data Integration Studio and your user profil
 
 This can happen if you enter the wrong `serverName` when deploying the SAS program on an EBI platform.  Make sure it matches an existing Stored Process Server Context.
 
-The error may also be thrown due to an encoding issue - changing to a UTF-8 server has helped at least one customer.
+The error may also be thrown due to an encoding issue - changing to a UTF-8 server has helped at least one customer.
+
+## Determining Application Version
+
+The app version is bundled into the frontend during the release, and is visible by clicking your username in the top right.
+
+You can also determine the app version (and SASjs Version, and build time) by opening browser Development Tools and running `appinfo()` in the console.

docs/dcu-fileupload.md

@@ -1,68 +0,0 @@
-# Data Controller for SAS: File Uploads
-
-Files can be uploaded via the Editor interface - first choose the library and table, then click "Upload".  All versions of excel are supported.  
-
-Uploaded data may *optionally* contain a column named `_____DELETE__THIS__RECORD_____` - where this contains the value "Yes" the row is marked for deletion.
-
-If loading very large files (eg over 10mb) it is more efficient to use CSV format, as this bypasses the local rendering engine, but also the local DQ checks - so be careful!  Examples of local (excel) but not remote (CSV) file checks include:
-
-* Length of character variables - CSV files are truncated at the max target column length
-* Length of numeric variables - if the target numeric variable is below 8 bytes then the staged CSV value may be rounded if it is too large to fit
-* NOTNULL - this rule is only applied at backend when the constraint is physical (rather than a DC setting)
-* MINVAL 
-* MAXVAL
-* CASE
-
-Note that the HARDSELECT_*** hooks are not applied to the rendered Excel values (they are currently only applied when editing a cell).
-
-![image](https://user-images.githubusercontent.com/4420615/233036372-87b8dd02-a4cd-4f19-ac1b-bb9fdc850607.png)
-
-
-## Excel Uploads
-
-Thanks to our pro license of [sheetJS](https://sheetjs.com/), we can support all versions of excel, large workbooks, and extract data extremely fast.  We also support the ingest of [password-protected workbooks](/videos#uploading-a-password-protected-excel-file).
-
-The rules for data extraction are:
-
-* Scan the spreadsheet until a row is found with all the target columns (not case sensitive)
-* Extract data below until the *first row containing a blank primary key value*
-
-This is incredibly flexible, and means:
-
-* data can be anywhere, on any worksheet
-* data can contain additional columns (they are just ignored)
-* data can be completely surrounded by other data
-
-A copy of the original Excel file is also uploaded to the staging area.  This means that a complete audit trail can be captured, right back to the original source data.
-
-!!! note
-    If the excel contains more than one range with the target columns (eg, on different sheets), only the FIRST will be extracted.
-
-## CSV Uploads
-
-The following should be considered when uploading data in this way:
-
- - A header row (with variable names) is required
- - Variable names must match those in the target table (not case sensitive).  An easy way to ensure this is to download the data from Viewer and use this as a template.
- - Duplicate variable names are not permitted
- - Missing columns are not permitted
- - Additional columns are ignored
- - The order of variables does not matter EXCEPT for the (optional) `_____DELETE__THIS__RECORD_____` variable.  When using this variable, it must be the **first**.
- - The delimiter is extracted from the header row - so for `var1;var2;var3` the delimeter would be assumed to be a semicolon
- - The above assumes the delimiter is the first special character! So `var,1;var2;var3` would fail
- - The following characters should **not** be used as delimiters
-    - doublequote
-    - quote
-    - space
-    - underscore
-
-When loading dates, be aware that Data Controller makes use of the `ANYDTDTE` and `ANYDTDTTME` informats (width 19).
-This means that uploaded date / datetime values should be unambiguous (eg `01FEB1942` vs `01/02/42`), to avoid confusion - as the latter could be interpreted as `02JAN2042` depending on your locale and options `YEARCUTOFF` settings.  Note that UTC dates with offset values (eg `2018-12-26T09:19:25.123+0100`) are not currently supported.  If this is a feature you would like to see, contact us.
-
-!!! tip
-    To get a copy of a file in the right format for upload, use the [file download](/dc-userguide/#usage) feature in the Viewer tab
-    
-!!! warning
-    Lengths are taken from the target table.  If a CSV contains long strings (eg `"ABCDE"` for a $3 variable) then the rest will be silently truncated (only `"ABC"` staged and loaded). If the target variable is a short numeric (eg 4., or 4 bytes) then floats or large integers may be rounded.  This issue does not apply to excel uploads, which are first validated in the browser.
-
-

docs/excel.md

@@ -1,16 +1,64 @@
 ---
 layout: article
 title: Excel
-description: Load Excel to SAS whilst retaining your favourite formulas! Data can be on any sheet, on any cell, even surrounded by other data.  All versions of Excel supported.
+description: Data Controller can extract all manner of data from within an Excel file (including formulae) ready for ingestion into SAS.  All versions of excel are supported.
 og_image:  https://docs.datacontroller.io/img/excel_results.png
 ---
 
 # Excel Uploads
 
-Data Controller for SAS® supports all versions of excel.  Data is extracted from excel from within the browser - there is no need for additional SAS components.  So long as the column names match those in the target table, the data can be on any worksheet, start from any row, and any column.
-The data can be completely surrounded by irrelevant data - the extraction will stop as soon as it hits one empty cell in a primary key column.  The columns can be in any order, and are not case sensitive.  More details [here](/dcu-fileupload/#excel-uploads).
+Data Controller supports two approaches for importing Excel data into SAS:
 
-## Formulas
+ - Simple - source range in tabular format, with column names/values that match the target Table.  No configuration necessary.
+ - Complex - data is scattered across multiple ranges in a dynamic (non-fixed) arrangement.  Pre-configuration necessary.
+
+
+Thanks to our pro license of [sheetJS](https://sheetjs.com/), we can support all versions of excel, large workbooks, and fast extracts.  We also support the ingest of [password-protected workbooks](/videos#uploading-a-password-protected-excel-file).
+
+
+Note that data is extracted from excel from _within the browser_ - meaning there is no need for any special SAS modules / products.
+
+A copy of the original Excel file is also uploaded to the staging area.  This means that a complete audit trail can be captured, right back to the original source data.
+
+## Simple Excel Uploads
+
+To make a _simple_ extract, select LOAD / Tables / (library/table) and click "UPLOAD" (or drag the file onto the page).  No configuration necessary.
+
+![](img/xltables.png)
+
+The rules for data extraction are:
+
+* Scan the each sheet until a row is found with all target columns
+* Extract rows until the first *blank primary key value*
+
+This is incredibly flexible, and means:
+
+* data can be anywhere, on any worksheet
+* data can start on any row, and any column
+* data can be completely surrounded by other data
+* columns can be in any order
+* additional columns are simply ignored
+
+
+!!! note
+    If the excel contains more than one range with the target columns (eg, on different sheets), only the FIRST will be extracted.
+
+Uploaded data may *optionally* contain a column named `_____DELETE__THIS__RECORD_____` - if this contains the value "Yes", the row is marked for deletion.
+
+If loading very large files (eg over 10mb) it is more efficient to use CSV format, as this bypasses the local rendering engine, but also the local DQ checks - so be careful!  Examples of local (excel) but not remote (CSV) file checks include:
+
+* Length of character variables - CSV files are truncated at the max target column length
+* Length of numeric variables - if the target numeric variable is below 8 bytes then the staged CSV value may be rounded if it is too large to fit
+* NOTNULL - this rule is only applied at backend when the constraint is physical (rather than a DC setting)
+* MINVAL
+* MAXVAL
+* CASE
+
+Note that the HARDSELECT_*** hooks are not applied to the rendered Excel values (they are only applied when actively editing a cell).
+
+![image](https://user-images.githubusercontent.com/4420615/233036372-87b8dd02-a4cd-4f19-ac1b-bb9fdc850607.png)
+
+### Formulas
 
 It is possible to configure certain columns to be extracted as formulae, rather than raw values.  The target column must be character, and it should be wide enough to support the longest formula in the source data.  If the order of values is important, you should include a row number in your primary key.
 
@@ -26,5 +74,53 @@ The final table will look like this:
 
 ![](img/excel_results.png)
 
-If you would like further integrations / support with excel uploads, we are happy to discuss new features.  Just [get in touch](https://datacontroller.io/contact).
+
+
+## Complex Excel Uploads
+
+Through the use of "Excel Maps" you can dynamically extract individual cells or entire ranges from anywhere within a workbook - either through absolute / relative positioning, or by reference to a "matched" (search) string.
+
+Configuration is made in the following tables:
+
+1.  [MPE_XLMAP_RULES](/tables/mpe_xlmap_rules) - detailed extraction rules for a particular map
+2.  [MPE_XLMAP_INFO](/tables/mpe_xlmap_info) - optional map-level attributes
+
+Each [rule](/tables/mpe_xlmap_rules) will extract either a single cell or a rectangular range from the source workbook.  The target will be [MPE_XLMAP_DATA](/tables/mpe_xlmap_data), or whichever table is configured in [MPE_XLMAP_INFO](/tables/mpe_xlmap_info).
+
+To illustrate with an example - consider the following excel. The yellow cells need to be imported.
+
+![](img/xlmap_example.png)
+
+The [MPE_XLMAP_RULES](/tables/mpe_xlmap_rules) configuration entries _might_ (as there are multiple ways) be as follows:
+
+|XLMAP_ID|XLMAP_RANGE_ID|XLMAP_SHEET|XLMAP_START|XLMAP_FINISH|
+|---|---|---|---|---|
+|MAP01|MI_ITEM|Current Month|`MATCH B R[1]C[0]: ITEM`|`LASTDOWN`|
+|MAP01|MI_AMT|Current Month|`MATCH C R[1]C[0]: AMOUNT`|`LASTDOWN`|
+|MAP01|TMI|Current Month|`ABSOLUTE F6`||
+|MAP01|CB|Current Month|`MATCH F R[2]C[0]: CASH BALANCE`||
+|MAP01|RENT|/1|`MATCH E R[0]C[2]: Rent/mortgage`||
+|MAP01|CELL|/1|`MATCH E R[0]C[2]: Cell phone`||
+
+To import the excel, the end user simply needs to navigate to the LOAD tab, choose "Files", select the appropriate map (eg MAP01), and upload.  This will stage the new records in [MPE_XLMAP_DATA](/tables/mpe_xlmap_data) which will go through the usual approval process and quality checks.  A copy of the source excel file will be attached to each upload.
+
+The corresponding [MPE_XLMAP_DATA](/tables/mpe_xlmap_data) table will appear as follows:
+
+| LOAD_REF     | XLMAP_ID | XLMAP_RANGE_ID | ROW_NO | COL_NO | VALUE_TXT       |
+|---------------|----------|----------------|--------|--------|-----------------|
+| DC20231212T154611798_648613_3895 | MAP01    | MI_ITEM        | 1      | 1      | Income Source 1 |
+| DC20231212T154611798_648613_3895 | MAP01    | MI_ITEM        | 2      | 1      | Income Source 2 |
+| DC20231212T154611798_648613_3895 | MAP01    | MI_ITEM        | 3      | 1      | Other           |
+| DC20231212T154611798_648613_3895 | MAP01    | MI_AMT         | 1      | 1      | 2500      |
+| DC20231212T154611798_648613_3895 | MAP01    | MI_AMT         | 2      | 1      | 1000       |
+| DC20231212T154611798_648613_3895 | MAP01    | MI_AMT         | 3      | 1      | 250         |
+| DC20231212T154611798_648613_3895 | MAP01    | TMI            | 1      | 1      | 3750           |
+| DC20231212T154611798_648613_3895 | MAP01    | CB             | 1      | 1      | 864            |
+| DC20231212T154611798_648613_3895 | MAP01    | RENT           | 1      | 1      | 800      |
+| DC20231212T154611798_648613_3895 | MAP01    | CELL           | 1      | 1      | 45         |
+
+
+### Video
+
+<iframe title="Complex Excel Uploads" width="560" height="315" src="https://vid.4gl.io/videos/embed/3338f448-e92d-4822-b3ec-7f6d7530dfc8?peertubeLink=0" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups"></iframe>
 

docs/files.md

@@ -0,0 +1,42 @@
+# Data Controller for SAS: File Uploads
+
+Data Controller supports the ingestion of two file formats - Excel (any version) and CSV.
+
+If you would like to support other file types, do [get in touch](https://datacontroller.io/contact)!
+
+
+
+## Excel Uploads
+
+Data can be uploaded in regular (tabular) or dynamic (complex) format.  For details, see the [excel](/excel) page.
+
+
+## CSV Uploads
+
+The following should be considered when uploading data in this way:
+
+ - A header row (with variable names) is required
+ - Variable names must match those in the target table (not case sensitive).  An easy way to ensure this is to download the data from Viewer and use this as a template.
+ - Duplicate variable names are not permitted
+ - Missing columns are not permitted
+ - Additional columns are ignored
+ - The order of variables does not matter EXCEPT for the (optional) `_____DELETE__THIS__RECORD_____` variable.  When using this variable, it must be the **first**.
+ - The delimiter is extracted from the header row - so for `var1;var2;var3` the delimeter would be assumed to be a semicolon
+ - The above assumes the delimiter is the first special character! So `var,1;var2;var3` would fail
+ - The following characters should **not** be used as delimiters
+    - doublequote
+    - quote
+    - space
+    - underscore
+
+When loading dates, be aware that Data Controller makes use of the `ANYDTDTE` and `ANYDTDTTME` informats (width 19).
+This means that uploaded date / datetime values should be unambiguous (eg `01FEB1942` vs `01/02/42`), to avoid confusion - as the latter could be interpreted as `02JAN2042` depending on your locale and options `YEARCUTOFF` settings.  Note that UTC dates with offset values (eg `2018-12-26T09:19:25.123+0100`) are not currently supported.  If this is a feature you would like to see, contact us.
+
+!!! tip
+    To get a copy of a file in the right format for upload, use the [file download](/dc-userguide/#usage) feature in the Viewer tab
+
+!!! warning
+    Lengths are taken from the target table.  If a CSV contains long strings (eg `"ABCDE"` for a $3 variable) then the rest will be silently truncated (only `"ABC"` staged and loaded). If the target variable is a short numeric (eg 4., or 4 bytes) then floats or large integers may be rounded.  This issue does not apply to excel uploads, which are first validated in the browser.
+
+
+When loading CSVs, the entire file is passed to backend for ingestion.  This makes it more efficient for large files, but does mean that frontend validations are bypassed.

docs/index.md

@@ -29,7 +29,7 @@ The following resources contain additional information on the Data Controller:
 
 Data Controller is regularly updated with new features.  If you see something that is not listed, and we agree it would be useful, you can engage us with Developer Days to build the feature in.
 
-* [Excel uploads](/dcu-fileupload/#excel-uploads) - drag & drop directly into SAS. All versions of excel supported.
+* [Excel uploads](/excel) - drag & drop directly into SAS. All versions of excel supported.
 * Data Lineage - at both table and column level, export as image or CSV
 * Data Validation Rules - both automatic and user defined
 * Data Dictionary - map data definitions and ownership

docs/restore.md

@@ -0,0 +1,32 @@
+---
+layout: article
+title: Data Restore
+description: How to restore a previous version of a Data Controller table
+og_image:  https://docs.datacontroller.io/img/restore.png
+---
+
+# Data Restore
+
+For those tables which have [Audit Tracking](/dcc-tables/#audit_libds) enabled, it is possible to restore the data to an earlier state!
+
+Simply open the submit to be reverted (via HISTORY or the table INFO/VERSIONS screen), and click the red **REVERT** button.  This will generate a NEW submission, containing the necessary reversal entries.  This new submission **must then be approved** in the usual fashion.
+
+![](/img/restore.png)
+
+This approach means that the audit history remains intact - there is simply a new entry, which reverts all the previous entries.
+
+## Caveats
+
+Note that there are some caveats to this feature:
+
+- User must have EDIT permission
+- Table must have TXTEMPORAL or UPDATE Load Type
+- Changes **outside** of Data Controller cannot be reversed
+- If there are COLUMN or ROW level security rules, the restore will abort
+- If the model has changed (new / deleted) columns the restore will abort
+
+## Technical Information
+
+The restore works by undoing all the changes listed in the [MPE_AUDIT](/tables/mpe_audit/) table.  The keys from this table (since and including the version to be restored) are left joined to the base table (to get current values) to create a staging dataset, and then the changes applied in reverse chronological order using [this macro](https://core.sasjs.io/mp__stripdiffs_8sas.html).  This staging dataset is then submitted for approval, providing a final sense check before the new / reverted state is applied. 
+
+Source code for the restore process is available [here](https://git.datacontroller.io/dc/dc/src/branch/main/sas/sasjs/services/editors/restore.sas).

docs/roadmap.md

@@ -1,7 +1,7 @@
 ---
 layout: article
 title: Roadmap
-description: The Data Controller roadmap is aligned with the needs of our customers - we continue to build and prioritise on Features requested by, and funded by, new and existing customers.
+description: The Data Controller roadmap is aligned with the needs of our customers - we continue to build and prioritise on Features requested by new and existing customers.
 og_image:  https://i.imgur.com/xFGhgg0.png
 ---
 
@@ -11,20 +11,17 @@ og_image:  https://i.imgur.com/xFGhgg0.png
 
 On this page you can find details of the Features that have currently been requested, that we agree would add value to the product, and are therefore in our development roadmap.
 
-Where customers are paying for the new Features (eg with our discounted Developer Days offer), then those Features will always take priority.  Where funding is not available, new Features will be addressed during the Bench Time of our developers, and will always be performed after Bug Fixes.
-
 If you would like to see a new Feature added to Data Controller, then let's have a chat!
 
 
 ## Requested Features
 
-Where features are requested, whether there is budget or not, we will describe the work below and provide estimates.
+When features are requested, we will describe the work to be performed in the sections below.
 
-The following features are currently requested, and awaiting budget:
+The following features are currently requested:
 
 * Ability to set 'number of approvals' to zero, enabling instant updates (4 days)
 * Ability to restore previous versions
-* Ability to import complex excel data using Excel Maps (10.5 days)
 * Ability to make automated submissions using an API
 
 
@@ -37,70 +34,9 @@ The following changes are necessary to implement this feature:
 * Additions to the test suite
 * Pre-flight checks to ensure the SUBMITTER has APPROVAL rights prior to submit
 * Log handling
-* Updates to documentation 
+* Updates to documentation
 * Release Notes
 
-### Complex Excel Uploads
-
-When Excel data arrives in multiple ranges, or individual cells, and the cells vary in terms of their column or row identifier, made more "interesting" with the use of merged cells - a rules engine becomes necessary!
-
-This feature enables the use of "EXCEL MAPS".  It will enable multiple tables to be loaded in a single import, and that data can be scattered across multiple sheets / cells / ranges, accessed via the rules described further below.
-
-The backend SAS tables must still exist, but the column names do not need to appear in the excel file.
-
-To drive the behaviour, a new configuration table must be added to the control library - MPE_EXCEL_MAP.  The columns are defined as follows:
-
-* **XLMAP_ID** - a unique reference for the excel map
-* **XLMAP_LIB** - the library of the target table for the data item or range
-* **XLMAP_DS** - the target table for the data item or range
-* **XLMAP_COL** - the target column for the data item or range
-* **XLMAP_SHEET** - the sheet name in which to capture the data.  Rules start with a forward slash (/).  Example values:
-    * `Sheet2` - an absolute reference
-    * `/FIRST` - the first tab in the workbook
-* **XLMAP_START** - the rule used to find the top left of the range. Use "R1C1" notation to move the target.  Example values:
-    * `ABSOLUTE F4` - an absolute reference
-    * `MATCH P R[0]C[2] |My Test` - search column P for the string "My Test" then move 2 columns right
-    * `MATCH 7 R[-2]C[-1] |Top Banana` - search row 7 for the string "Top Banana" then move 2 rows up and 1 column left
-* **XLMAP_FINISH** - The rule used to find the end of the range.  Leave blank for individual cells. Example values:
-    * `BLANKROW` - search down until a blank row is found, then choose the row above it
-    * `LASTDOWN` - The last non blank cell below the start cell
-    * `RIGHT 3` - select 3 more cells to the right (4 selected in total)
-
-
-To illustrate with an example - consider the following excel.  The yellow cells need to be imported.
-
-![Complex Excel for SAS Import](/img/excel_map.png)
-
-The data will be imported into two SAS tables - the cells on the left will go into a table with multiple rows, and the cells on the right will be entered as a single row.  The XLMAP_ID will also be added to both tables, and the tables will need to have had their keys and quality rules defined in Data Controller in the usual way.
-
-The MPE_EXCEL_MAP configuration entries would be as follows:
-
-|XLMAP_ID|XLMAP_LIB|XLMAP_DS|XLMAP_COL|XLMAP_SHEET|XLMAP_START|XLMAP_FINISH|
-|---|---|---|---|---|----|---|
-|MAP01|MYLIB|DS1|MI_ITEM|Current Month|`MATCH B R[1]C[0] |ITEM`|`LASTDOWN`|
-|MAP01|MYLIB|DS1|MI_AMT|Current Month|`MATCH C R[1]C[0] |AMOUNT`|`LASTDOWN`|
-|MAP01|MYLIB|DS2|TMI|Current Month|`ABSOLUTE F6`||
-|MAP01|MYLIB|DS2|CB|Current Month|`MATCH F R[2]C[0] |CASH BALANCE`||
-|MAP01|MYLIB|DS2|RENT|Current Month|`MATCH E R[0]C[2] |Rent/mortgage`||
-|MAP01|MYLIB|DS2|CELL|Current Month|`MATCH E R[0]C[2] |Cell phone`||
-
-To import the excel, the end user simply needs to navigate to the UPLOAD tab, select the appropriate map (eg MAP01), and upload.  This will stage two tables (MYLIB.DS1 and MYLIB.DS2) which will go through the usual approval process and quality checks.  A copy of the source excel file will be attached to each upload.
-
-#### Estimates
-
-|Component|Estimate (days)|Description|
-|---|---|---|
-|Frontend|1|Build ExcelMap page with dropdown (and fetching rules), plus drag & drop modal for excel capture|
-|Frontend|1|Create staged (unsubmitted) page with support for multiple tables|
-|Frontend|2|Create standalone framework utility for rules engine (utils folder), /FIRST sheet rule and Absolute rule|
-|Frontend|2|Implement MATCH rule (with BLANKROW, LASTDOWN and {DIRECTION + INTEGER} finish rules)|
-|Frontend|0.5|Developer documentation|
-|Frontend|2|Cypress tests|
-|Backend|0.5|Prep MPE_EXCEL_MAP table, including validations, integrate with DCLIB and add to CI build|
-|Backend|1|Create services to fetch Excel Maps and rules (only those the user has permissions for), corresponding SASjs tests, and update developer docs|
-|Backend|0.5|Publish online documentation for the overall Excel Maps feature|
-
-Total: **10.5 days**
 
 ### API Submissions
 
@@ -125,7 +61,7 @@ Format Catalogs can now be viewed, filtered, exported and edited.  See [docs](/f
 
 ### Change Tracking Information in a Single Transaction Table
 
-Now available in [mpe_audit](/mpe_audit.md)
+Now available in [mpe_audit](/tables/mpe_audit)
 
 ### Dynamic Filtering
 
@@ -215,3 +151,13 @@ It was necessary to find a way to restrict the tables which certain groups could
 **Solution**
 
 We added a [new access level](/dcc-security/#view) in the MPE_SECURITY table so that access could be restricted at both TABLE and LIBRARY level.
+
+### Complex Excel Uploads
+
+Our customer was ingesting Basel III reports into SAS and needed an easy to use mechanism for extracting very specific cells and ranges from a constantly changing workbook format.
+
+**Solution**
+
+We built an approach that allowed end users to define a series of rules for importing cells and ranges from anywhere within a workbook - based on absolute / relative positioning, or using search strings.
+
+The changes we made to deliver this feature are described [here](https://git.datacontroller.io/dc/dc/issues/69) and the final documentation is [here](/excel).

docs/tables/mpe_column_level_security.md

@@ -6,7 +6,7 @@ description: The MPE_COLUMN_LEVEL_SECURITY table is used to configure which grou
 
 # MPE_COLUMN_LEVEL_SECURITY
 
-The MPE_COLUMN_LEVEL_SECURITY table is used to configure which groups can VIEW or EDIT particular columns within a table.  More details are available in the [user guide](/column-level-security.md)
+The MPE_COLUMN_LEVEL_SECURITY table is used to configure which groups can VIEW or EDIT particular columns within a table.  More details are available in the [user guide](/column-level-security)
 
 ## Columns
 

docs/tables/mpe_requests.md

@@ -0,0 +1,23 @@
+---
+layout: article
+title: MPE_REQUESTS
+description: The MPE_REQUESTS table contains an entry with details for every backend request (user, timestamp, job name)
+og_image: /img/mpe_requests.png
+---
+
+# MPE_REQUESTS
+The MPE_REQUESTS table contains an entry with details for every backend request.  This is applied in the [mpeterm.sas](https://code.datacontroller.io/mpeterm_8sas.html) macro.
+
+In some scenarios this can cause table locks.  To avoid this, you can set the [dc_request_logs](/dcc-options/#dc_request_logs) option to NO.
+
+![](/img/mpe_requests.png)
+
+## Columns
+
+There is explicitly **no primary key** on this (transaction) table for the purpose of speedy updates
+
+ - `REQUEST_DTTM num`: Timestamp of the request
+ - `REQUEST_USER char(64)`: The user making the request
+ - `REQUEST_SERVICE char(64)`: The STP/Job being executed (under $apploc/services)
+ - `REQUEST_PARAMS char(128)`: Empty for now
+

docs/tables/mpe_security.md

@@ -0,0 +1,25 @@
+---
+layout: article
+title: MPE_SECURITY
+description: The MPE_SECURITY table determines which GROUPS can VIEW, EDIT, or APPROVE which tables or libraries
+og_title: MPE_SECURITY Table Documentation
+og_image: ../img/securitytable.png
+---
+
+# MPE_SECURITY
+
+The MPE_SECURITY table determines which GROUPS can VIEW, EDIT, or APPROVE which tables or libraries
+
+![Screenshot](../img/securitytable.png)
+
+Edits to this table are covered by a (backend) post edit hook, which will automatically uppercase the LIBREF, DSN and ACCESS_LEVEL.
+
+
+## Columns
+
+ - 🔑 `TX_FROM num`: SCD2 open datetime
+ - 🔑 `LIBREF char(8)`: The LIBREF of the target table
+ - 🔑 `DSN char(32)`: The name of the target dataset (or format catalog)
+ - 🔑 `ACCESS_LEVEL char(100)`: Either VIEW, EDIT or APPROVE
+ - 🔑 `SAS_GROUP char(100)`: The SAS Group to which to provide access
+ - `TX_TO num`: SCD2 close datetime

docs/tables/mpe_submit.md

@@ -8,7 +8,7 @@ og_image: /img/mpe_submit.png
 
 # MPE_SUBMIT
 
-The MPE_SUBMIT table tracks the status of submitted modifications - ie SUBMITTED, APPROVED, or REJECTED.  It is unique on TABLE_ID.  A record is created whenever a submit is submitted.  
+The MPE_SUBMIT table tracks the status of submitted modifications - ie SUBMITTED, APPROVED, or REJECTED.  It is unique on TABLE_ID.  A record is created whenever a submit is submitted.
 
 ![submits](/img/mpe_submit.png)
 
@@ -19,7 +19,7 @@ The MPE_SUBMIT table tracks the status of submitted modifications - ie SUBMITTED
  - `SUBMIT_STATUS_CD char(10)`: Either SUBMITTED, APPROVED, or REJECTED.  Remains SUBMITTED until the final approval, or first rejection.
  - `BASE_LIB char(8)`: The LIBREF of the table being updated
  - `BASE_DS char(32)`: The name of the dataset (or format catalog) being updated
- - `SUBMITTED_BY_NM (100)`: The username of the submitter
+ - `SUBMITTED_BY_NM char(100)`: The username of the submitter
  - `SUBMITTED_ON_DTTM num`: The timestamp of the submission
  - `SUBMITTED_REASON_TXT char(400)`: The description provided by the submitter
  - `INPUT_OBS num`: The number of observations staged

docs/tables/mpe_tables.md

@@ -4,7 +4,7 @@ title: MPE_TABLES
 description: The MPE_TABLES table defines the tables that are EDITABLE within Data Controller for SAS® - along with attributes such as load type, number of approvals, and hook scripts.
 ---
 
-# MPE_DATASTATUS_TABS
+# MPE_TABLES
 
 The `MPE_TABLES` table defines the tables that are EDITABLE - along with attributes such as load type, number of approvals, and hook scripts.
 

docs/tables/mpe_xlmap_data.md

@@ -0,0 +1,31 @@
+---
+layout: article
+title: MPE_XLMAP_DATA
+description: The MPE_XLMAP_DATA table stores the data from complex excel uploads in a vertical format.
+og_title: MPE_XLMAP_DATA Table Documentation
+og_image: ../img/mpe_xlmap_data.png
+---
+
+# MPE_XLMAP_DATA
+
+The MPE_XLMAP_DATA table stores the data from complex excel uploads in a vertical format.  It is possible to configure a different target, so long as it has the same attributes, in the [MPE_XLMAP_INFO](/tables/mpe_xlmap_info) table.
+
+![Screenshot](../img/mpe_xlmap_data.png)
+
+See also:
+
+* [Excel Uploads](/excel)
+* [MPE_XLMAP_INFO](/tables/mpe_xlmap_info)
+* [MPE_XLMAP_RULES](/tables/mpe_xlmap_rules)
+
+!!!note
+    This table cannot be edited directly!  Any target tables configured in [MPE_XLMAP_INFO](/tables/mpe_xlmap_info) are also removed from the Tables list in the LOAD menu.
+
+## Columns
+
+ - 🔑 `LOAD_REF char(32)`:  The Unique Load reference.  Applied automatically.
+ - 🔑 `XLMAP_ID char(32)`:  The unique, UPPERCASE reference for the excel map.  Applied automatically.
+ - 🔑 `XLMAP_RANGE_ID char(32)`: A unique reference for the specific range being loaded.  Applied automatically.
+ - `ROW_NO num`: For single-cell / single-row sources, this is always 1.  Otherwise, it is the row number of the rectangular range being extracted in this XLMAP_RANGE_ID.
+ - `COL_NO num`: For single-cell / single-column sources, this is always 1.  Otherwise, it is the column number of the rectangular range being extracted in this XLMAP_RANGE_ID.
+ - `VALUE_TXT char(4000)`: The value of the cell, in text format.

docs/tables/mpe_xlmap_info.md

@@ -0,0 +1,32 @@
+---
+layout: article
+title: MPE_XLMAP_INFO
+description: The MPE_XLMAP_INFO table provides information about a particular XLMAP_ID
+og_title: MPE_XLMAP_INFO Table Documentation
+og_image: ../img/mpe_xlmap_info.png
+---
+
+# MPE_XLMAP_INFO
+
+The MPE_XLMAP_INFO table provides information about a particular XLMAP_ID
+
+The information is optional (unless you wish to configure a non-default target table).
+
+![Screenshot](../img/mpe_xlmap_info.png)
+
+See also:
+
+* [Excel Uploads](/excel)
+* [MPE_XLMAP_DATA](/tables/mpe_xlmap_data)
+* [MPE_XLMAP_RULES](/tables/mpe_xlmap_rules)
+
+
+
+
+## Columns
+
+ - `TX_FROM num`: SCD2 open datetime
+ - 🔑 `TX_TO num`: SCD2 close datetime
+ - 🔑 `XLMAP_ID char(32)`:  A unique, UPPERCASE reference for the excel map.
+ - `XLMAP_DESCRIPTION char(1000)`:  Map Description
+ - `XLMAP_TARGETLIBDS char(41)`: An alternative target table to which to upload the data.  This MUST have the same structure as the [MPE_XLMAP_DATA](/tables/mpe_xlmap_data) table.  The table must also be configured in [MPE_TABLES](/tables/mpe_tables).

docs/tables/mpe_xlmap_rules.md

@@ -0,0 +1,38 @@
+---
+layout: article
+title: MPE_XLMAP_RULES
+description: The MPE_XLMAP_RULES table contains the rules for mapping excel cells and ranges to XLMAP_IDs for upload into SAS
+og_title: MPE_XLMAP_RULES Table Documentation
+og_image: ../img/mpe_xlmap_rules.png
+---
+
+# MPE_XLMAP_RULES
+
+The MPE_XLMAP_RULES table contains the rules for mapping excel cells and ranges to XLMAP_IDs for [upload into SAS](/excel)
+
+![Screenshot](../img/mpe_xlmap_rules.png)
+
+See also:
+
+* [Excel Uploads](/excel)
+* [MPE_XLMAP_DATA](/tables/mpe_xlmap_data)
+* [MPE_XLMAP_INFO](/tables/mpe_xlmap_info)
+
+
+## Columns
+
+ - `TX_FROM num`: SCD2 open datetime
+ - 🔑 `TX_TO num`: SCD2 close datetime
+ - 🔑 `XLMAP_ID char(32)`:  A unique, UPPERCASE reference for the excel map.
+ - 🔑 `XLMAP_RANGE_ID char(32)`: A unique reference for the specific range being loaded
+ - `XLMAP_SHEET char(32)`:  The sheet name in which to capture the data. Examples:
+    - `Sheet2` - an absolute reference
+    - `/1` - the first tab in the workbook
+ - `XLMAP_START char(1000)`:  The rule used to find the top left of the range. Use "R1C1" notation to move the target. Examples:
+    - `ABSOLUTE F4` - an absolute reference
+    - `RELATIVE R[2]C[2]` - In the XMLMAP_START case, this is the same as `ABSOLUTE B2`
+    - `MATCH P R[0]C[2]: My Test` - search column P for the string "My Test" then move 2 columns right
+    - `MATCH 7 R[-2]C[-1]: Top Banana` - search row 7 for the string "Top Banana" then move 2 rows up and 1 column left
+ - `XLMAP_FINISH char(1000)`: The rule used to find the end of the range. Leave blank for individual cells. Example values include those listed under XLMAP_START, plus:
+    - `BLANKROW` - search down (from XLMAP_START) until an entirely blank row is found, then choose the row above it
+    - `LASTDOWN` - The last non blank cell below the XLMAP_START cell.  In the `RELATIVE R[x]C[x]` case, this is offset from from XLMAP_START rather than A1

mkdocs.yml

@@ -7,7 +7,8 @@ nav:
     - DC User Guide: dc-userguide.md
     - Data Catalog: dcu-datacatalog.md
     - Data Lineage: dcu-lineage.md
-    - File Uploads: dcu-fileupload.md
+    - Data Restore: restore.md
+    - File Uploads: files.md
     - Filter Mechanism: filter.md
     - Locking Mechanism: locking-mechanism.md
     - Table Viewer: dcu-tableviewer.md
@@ -23,15 +24,20 @@ nav:
     - MPE_DATASTATUS_LIBS: tables/mpe_datastatus_libs.md
     - MPE_DATASTATUS_TABS: tables/mpe_datastatus_tabs.md
     - MPE_LOCKANYTABLE: tables/mpe_lockanytable.md
+    - MPE_REQUESTS: tables/mpe_requests.md
     - MPE_REVIEW: tables/mpe_review.md
     - MPE_SUBMIT: tables/mpe_submit.md
+    - MPE_SECURITY: tables/mpe_security.md
     - MPE_TABLES: tables/mpe_tables.md
+    - MPE_XLMAP_DATA: tables/mpe_xlmap_data.md
+    - MPE_XLMAP_INFO: tables/mpe_xlmap_info.md
+    - MPE_XLMAP_RULES: tables/mpe_xlmap_rules.md
 - Configuration:
     - Column Level Security: column-level-security.md
     - Dates / Datetimes: dcc-dates.md
     - Dynamic Cell Dropdown: dynamic-cell-dropdown.md
     - Emails: emails.md
-    - Excel Formulas: excel.md
+    - Excel: excel.md
     - Formats: formats.md
     - Groups: dcc-groups.md
     - Libraries: libraries.md
@@ -44,9 +50,9 @@ nav:
 - Macros: macros.md
 - Installation:
     - System Requirements: dci-requirements.md
-    - SAS Viya Deploy: dci-deploysasviya.md
-    - SAS 9 Deploy: dci-deploysas9.md
-    - SAS 9 Dedicated STP: dci-stpinstance.md
+    - SAS Viya: dci-deploysasviya.md
+    - SAS 9 EBI: dci-deploysas9.md
+    - SAS 9 STP Hardening: dci-stpinstance.md
     - Troubleshooting: dci-troubleshooting.md
 - Legal:
     - Privacy Policy: privacy.md
@@ -57,7 +63,6 @@ nav:
     - Overview: roadmap.md
     - DC API: api.md
 
-
 markdown_extensions:
   - admonition
   - pymdownx.superfences
@@ -66,7 +71,6 @@ markdown_extensions:
   - toc:
       permalink: true
 
-
 extra:
   manifest: manifest.webmanifest
 
@@ -78,6 +82,7 @@ plugins:
   - redirects:
       redirect_maps:
           'dci-evaluation.md': 'dci-deploysas9.md'
+          'dcu-fileupload.md': 'files.md'
 
 # Repository
 repo_name: 'dc/docs.datacontroller.io'
@@ -100,4 +105,4 @@ theme:
     - JavaScript
     - Bash
 
-copyright: All rights reserved ©2022 Bowe IO Ltd.
+copyright: All rights reserved ©2023 Bowe IO Ltd.