From fc7c8101ed330283bd651302a42bd3dfcc4543f6 Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 14:44:49 +0100 Subject: [PATCH 01/11] ci: doxygen fix --- .gitea/workflows/build.yaml | 8 ++++++++ .gitea/workflows/release.yaml | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index eb1e5a6..2f7adc3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -18,6 +18,14 @@ jobs: env: NPMRC: ${{ secrets.NPMRC}} + - name: Test doxygen + run: | + apt-add-repository universe + apt-get update + apt-get install doxygen + cd sas + sasjs doc + - run: npm run lint:check - run: | cd client diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 4b4fb66..1c298c2 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -168,6 +168,10 @@ jobs: npm i -g @sasjs/cli # jq is used to parse the release JSON apt-get install jq -y + # doxygen is used for the SASJS docs + apt-add-repository universe + apt-get update + apt-get install doxygen - name: Create Empty Release (assets are posted later) run: | From 181f52eaeaa6dc29a7f0e2fa0b1bc1af07dd5640 Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 14:45:57 +0100 Subject: [PATCH 02/11] ci: doxygen fix --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 2f7adc3..77d8e8c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -20,7 +20,7 @@ jobs: - name: Test doxygen run: | - apt-add-repository universe + add-apt-repository universe apt-get update apt-get install doxygen cd sas From bb35cc15d269f27020a6386e1f4c74c411a69fb5 Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 14:46:32 +0100 Subject: [PATCH 03/11] ci: doxygen fix --- .gitea/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 77d8e8c..1c5ddc3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -20,7 +20,8 @@ jobs: - name: Test doxygen run: | - add-apt-repository universe + apt-get install software-properties-common + apt-add-repository universe apt-get update apt-get install doxygen cd sas From ec173da4ce300dd074ce458c16eb5d6594974310 Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 14:47:02 +0100 Subject: [PATCH 04/11] ci: doxygen fix --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 1c5ddc3..832c0f9 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -20,9 +20,9 @@ jobs: - name: Test doxygen run: | + apt-get update apt-get install software-properties-common apt-add-repository universe - apt-get update apt-get install doxygen cd sas sasjs doc From fdb18d242b62f5faf1c3a39c35ae29e925d1929a Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 14:47:30 +0100 Subject: [PATCH 05/11] ci: doxygen fix --- .gitea/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 832c0f9..d63cea5 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -21,9 +21,9 @@ jobs: - name: Test doxygen run: | apt-get update - apt-get install software-properties-common - apt-add-repository universe - apt-get install doxygen + apt-get install software-properties-common -y + apt-add-repository universe -y + apt-get install doxygen -y cd sas sasjs doc From 665a04f5c594ff9c30aa9ebda61043342b3e039d Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 17:01:26 +0100 Subject: [PATCH 06/11] ci: doxygen fix --- .gitea/workflows/build.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d63cea5..4d98ca7 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -21,8 +21,6 @@ jobs: - name: Test doxygen run: | apt-get update - apt-get install software-properties-common -y - apt-add-repository universe -y apt-get install doxygen -y cd sas sasjs doc From 687a1e1cb58e24344fe91ad8330885a58af752f5 Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 17:02:08 +0100 Subject: [PATCH 07/11] ci: doxygen fix --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 4d98ca7..92be788 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -23,6 +23,7 @@ jobs: apt-get update apt-get install doxygen -y cd sas + npm i --global @sasjs/cli sasjs doc - run: npm run lint:check From 1de48a49af0485e0c07129a4dfed32e290d0f375 Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 17:06:18 +0100 Subject: [PATCH 08/11] ci: doxygen fix --- .gitea/workflows/build.yaml | 11 +++-------- .gitea/workflows/release.yaml | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 92be788..8b55aad 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -18,15 +18,10 @@ jobs: env: NPMRC: ${{ secrets.NPMRC}} - - name: Test doxygen - run: | - apt-get update - apt-get install doxygen -y - cd sas - npm i --global @sasjs/cli - sasjs doc - + - name: Lint check - run: npm run lint:check + + - name: Licence checker - run: | cd client npm ci diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 1c298c2..4efeeb1 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -169,9 +169,8 @@ jobs: # jq is used to parse the release JSON apt-get install jq -y # doxygen is used for the SASJS docs - apt-add-repository universe apt-get update - apt-get install doxygen + apt-get install doxygen -y - name: Create Empty Release (assets are posted later) run: | From dadac4f13f85b5446198b6340cad28844defc94d Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 18:17:49 +0100 Subject: [PATCH 09/11] feat: viewer row handle --- client/src/app/viewer/viewer.component.html | 3 +++ client/src/app/viewer/viewer.component.ts | 5 +++++ client/src/environments/_eula.ts | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/client/src/app/viewer/viewer.component.html b/client/src/app/viewer/viewer.component.html index a7db9eb..ad3751f 100644 --- a/client/src/app/viewer/viewer.component.html +++ b/client/src/app/viewer/viewer.component.html @@ -630,6 +630,9 @@ [cells]="hotTable.cells" [maxRows]="hotTable.maxRows" [manualColumnResize]="true" + [rowHeaders]="hotTable.rowHeaders" + [rowHeaderWidth]="hotTable.rowHeaderWidth" + [rowHeights]="hotTable.rowHeights" [licenseKey]="hotTable.licenseKey" > diff --git a/client/src/app/viewer/viewer.component.ts b/client/src/app/viewer/viewer.component.ts index 33031a8..a4ea57a 100644 --- a/client/src/app/viewer/viewer.component.ts +++ b/client/src/app/viewer/viewer.component.ts @@ -108,6 +108,11 @@ export class ViewerComponent implements AfterContentInit, AfterViewInit { settings: {}, afterGetColHeader: undefined, licenseKey: undefined, + rowHeaders: (index: number) => { + return ' ' + }, + rowHeaderWidth: 15, + rowHeights: 20, contextMenu: ['copy_with_column_headers', 'copy_column_headers_only'], copyPaste: { copyColumnHeaders: true, diff --git a/client/src/environments/_eula.ts b/client/src/environments/_eula.ts index 684dea6..3d7cba2 100644 --- a/client/src/environments/_eula.ts +++ b/client/src/environments/_eula.ts @@ -18,4 +18,4 @@ In any case, you must not make any such use of this software as to develop softw 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. -` +` \ No newline at end of file From 830e3816a082643d595758e52659b437bc950676 Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 18:32:17 +0100 Subject: [PATCH 10/11] ci: build, syntax fix --- .gitea/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8b55aad..1c4ac1f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -19,10 +19,10 @@ jobs: NPMRC: ${{ secrets.NPMRC}} - name: Lint check - - run: npm run lint:check + run: npm run lint:check - name: Licence checker - - run: | + run: | cd client npm ci npm run license-checker \ No newline at end of file From ab89600c7369a9328cae78dc7003f2691c526b79 Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Mon, 4 Dec 2023 18:37:05 +0100 Subject: [PATCH 11/11] style: lint --- client/src/app/editor/editor.component.html | 8 ++++---- client/src/app/home/home.component.html | 2 +- client/src/app/review/history/history.component.html | 2 +- .../app/shared/contact-link/contact-link.component.html | 2 +- client/src/app/shared/dc-tree/dc-tree.component.html | 2 +- client/src/app/shared/viewboxes/viewboxes.component.html | 2 +- client/src/app/viewer/viewer.component.html | 2 +- client/src/environments/_eula.ts | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/src/app/editor/editor.component.html b/client/src/app/editor/editor.component.html index a5caec0..c3462ac 100644 --- a/client/src/app/editor/editor.component.html +++ b/client/src/app/editor/editor.component.html @@ -280,7 +280,7 @@ licenceState.value.editor_rows_allowed === 1 ? 'row' : 'rows' - }}, contact support@datacontroller.io @@ -417,7 +417,7 @@ licenceState.value.editor_rows_allowed === 1 ? 'row' : 'rows' - }}, contact support@datacontroller.io @@ -467,7 +467,7 @@ : 'rows' }} will be submitted. To remove the restriction, contact - support@datacontroller.io
@@ -528,7 +528,7 @@ Due to current licence, only {{ licenceState.value.submit_rows_limit }} rows in a file will be submitted. To remove the restriction, contact - support@datacontroller.io + support@datacontroller.io

diff --git a/client/src/app/home/home.component.html b/client/src/app/home/home.component.html index bde22bf..f18a546 100644 --- a/client/src/app/home/home.component.html +++ b/client/src/app/home/home.component.html @@ -100,7 +100,7 @@ *clrIfOpen > - To unlock all tables, contact support@datacontroller.io + To unlock all tables, contact support@datacontroller.io diff --git a/client/src/app/review/history/history.component.html b/client/src/app/review/history/history.component.html index 0b82ac6..69152bc 100644 --- a/client/src/app/review/history/history.component.html +++ b/client/src/app/review/history/history.component.html @@ -72,7 +72,7 @@ > To unlock more than {{ licenceState.value.history_rows_allowed }} records, contact - support@datacontroller.io + support@datacontroller.io

diff --git a/client/src/app/shared/contact-link/contact-link.component.html b/client/src/app/shared/contact-link/contact-link.component.html index a572894..1cbb818 100644 --- a/client/src/app/shared/contact-link/contact-link.component.html +++ b/client/src/app/shared/contact-link/contact-link.component.html @@ -2,5 +2,5 @@ [ngClass]="classes" [class.unset]="classes !== ''" href="mailto:support@datacontroller.io?subject=Licence" - >support@datacontroller.iosupport@datacontroller.io diff --git a/client/src/app/shared/dc-tree/dc-tree.component.html b/client/src/app/shared/dc-tree/dc-tree.component.html index 3fd5145..4f6c669 100644 --- a/client/src/app/shared/dc-tree/dc-tree.component.html +++ b/client/src/app/shared/dc-tree/dc-tree.component.html @@ -106,7 +106,7 @@ *clrIfOpen > - To unlock all tables, contact support@datacontroller.io + To unlock all tables, contact support@datacontroller.io diff --git a/client/src/app/shared/viewboxes/viewboxes.component.html b/client/src/app/shared/viewboxes/viewboxes.component.html index ca68c3a..50c6b38 100644 --- a/client/src/app/shared/viewboxes/viewboxes.component.html +++ b/client/src/app/shared/viewboxes/viewboxes.component.html @@ -13,7 +13,7 @@ class="licence-notice" >To unlock more then {{ licenceState.value.viewbox_limit }} {{ licenceState.value.viewbox_limit === 1 ? 'viewbox' : 'viewboxes' }}, - contact support@datacontroller.io diff --git a/client/src/app/viewer/viewer.component.html b/client/src/app/viewer/viewer.component.html index ad3751f..2c807f5 100644 --- a/client/src/app/viewer/viewer.component.html +++ b/client/src/app/viewer/viewer.component.html @@ -105,7 +105,7 @@ *clrIfOpen > - To unlock all tables, contact support@datacontroller.io + To unlock all tables, contact support@datacontroller.io diff --git a/client/src/environments/_eula.ts b/client/src/environments/_eula.ts index 3d7cba2..684dea6 100644 --- a/client/src/environments/_eula.ts +++ b/client/src/environments/_eula.ts @@ -18,4 +18,4 @@ In any case, you must not make any such use of this software as to develop softw 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. -` \ No newline at end of file +`