Compare commits

...

10 Commits

Author SHA1 Message Date
semantic-release-bot
7e11c8f375 chore(release): 6.14.6 [skip ci]
## [6.14.6](https://git.datacontroller.io/dc/dc/compare/v6.14.5...v6.14.6) (2025-04-03)

### Bug Fixes

* history table modal links styling ([c63fcdd](c63fcdd465))
2025-04-03 08:32:36 +00:00
23cbbce964 Merge pull request 'History table modal links styling' (#151) from history-links into main
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 3m47s
Release / Build-and-test-development (push) Successful in 8m19s
Release / release (push) Successful in 7m55s
Reviewed-on: #151
2025-04-03 08:16:57 +00:00
Mihajlo Medjedovic
c63fcdd465 fix: history table modal links styling
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 3m58s
Build / Build-and-test-development (pull_request) Successful in 8m24s
2025-04-02 19:15:29 +02:00
semantic-release-bot
82412b2659 chore(release): 6.14.5 [skip ci]
## [6.14.5](https://git.datacontroller.io/dc/dc/compare/v6.14.4...v6.14.5) (2025-03-24)

### Bug Fixes

* improving accessibility lighthouse score ([7f3577c](7f3577c3ef))
* prevent errors when using sqlrc in a DI job in a HOOK ([d1f0879](d1f0879f0a))
* user profile style fix, new select library and table icons ([69f8830](69f883034f))
2025-03-24 23:10:35 +00:00
eef3832e40 Merge pull request 'User profile style fix, new select library and table icons, improved accessibility score' (#150) from styling into main
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 3m53s
Release / Build-and-test-development (push) Successful in 8m14s
Release / release (push) Successful in 8m14s
Reviewed-on: #150
2025-03-24 22:42:40 +00:00
63b75a1c61 Merge branch 'main' into styling
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 3m51s
Build / Build-and-test-development (pull_request) Successful in 8m14s
2025-03-24 22:42:31 +00:00
d1f0879f0a fix: prevent errors when using sqlrc in a DI job in a HOOK
Some checks failed
Release / release (push) Blocked by required conditions
Release / Build-production-and-ng-test (push) Successful in 3m54s
Release / Build-and-test-development (push) Has been cancelled
2025-03-24 21:35:17 +00:00
Mihajlo Medjedovic
36416aab2e style: lint
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 3m53s
Build / Build-and-test-development (pull_request) Successful in 8m16s
2025-03-21 14:08:57 +01:00
Mihajlo Medjedovic
7f3577c3ef fix: improving accessibility lighthouse score 2025-03-21 14:08:24 +01:00
Mihajlo Medjedovic
69f883034f fix: user profile style fix, new select library and table icons
Some checks failed
Build / Build-and-ng-test (pull_request) Failing after 49s
Build / Build-and-test-development (pull_request) Successful in 8m21s
2025-03-20 17:33:35 +01:00
31 changed files with 2075 additions and 2047 deletions

View File

@ -1,3 +1,19 @@
## [6.14.6](https://git.datacontroller.io/dc/dc/compare/v6.14.5...v6.14.6) (2025-04-03)
### Bug Fixes
* history table modal links styling ([c63fcdd](https://git.datacontroller.io/dc/dc/commit/c63fcdd465950ada439d7d69622a3886e8f3a783))
## [6.14.5](https://git.datacontroller.io/dc/dc/compare/v6.14.4...v6.14.5) (2025-03-24)
### Bug Fixes
* improving accessibility lighthouse score ([7f3577c](https://git.datacontroller.io/dc/dc/commit/7f3577c3ef9f44e55a58bc64fbf89a3a64006dd4))
* prevent errors when using sqlrc in a DI job in a HOOK ([d1f0879](https://git.datacontroller.io/dc/dc/commit/d1f0879f0acf7e816c80f7635fd02f4f284214ed))
* user profile style fix, new select library and table icons ([69f8830](https://git.datacontroller.io/dc/dc/commit/69f883034fabbed31aa5d832e20561c4ae3042db))
## [6.14.4](https://git.datacontroller.io/dc/dc/compare/v6.14.3...v6.14.4) (2025-03-18)

View File

@ -10,7 +10,7 @@ const check = (cwd) => {
onlyAllow:
'AFLv2.1;Apache 2.0;Apache-2.0;Apache*;Artistic-2.0;0BSD;BSD*;BSD-2-Clause;BSD-3-Clause;CC0-1.0;CC-BY-3.0;CC-BY-4.0;ISC;MIT;MPL-2.0;ODC-By-1.0;Python-2.0;Unlicense;',
excludePackages:
'@cds/city@1.1.0;@handsontable/angular@14.6.2;handsontable@14.6.2;hyperformula@2.7.1;jackspeak@3.4.3;path-scurry@1.11.1;package-json-from-dist@1.0.1'
'@cds/city@1.1.0;@handsontable/angular@15.2.0;handsontable@15.2.0;hyperformula@2.7.1;hyperformula@3.0.0;jackspeak@3.4.3;path-scurry@1.11.1;package-json-from-dist@1.0.1'
},
(error, json) => {
if (error) {

1793
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -44,11 +44,11 @@
"@angular/platform-browser": "^17.3.3",
"@angular/platform-browser-dynamic": "^17.3.3",
"@angular/router": "^17.3.3",
"@cds/core": "^6.10.0",
"@clr/angular": "^17.0.1",
"@cds/core": "^6.15.1",
"@clr/angular": "^17.8.0",
"@clr/icons": "^13.0.2",
"@clr/ui": "^17.0.1",
"@handsontable/angular": "^14.3.0",
"@clr/ui": "^17.8.0",
"@handsontable/angular": "^15.2.0",
"@sasjs/adapter": "^4.11.0",
"@sasjs/utils": "^3.4.0",
"@sheet/crypto": "file:libraries/sheet-crypto.tgz",
@ -60,7 +60,7 @@
"crypto-js": "^4.2.0",
"d3-graphviz": "^5.0.2",
"fs-extra": "^7.0.1",
"handsontable": "^14.3.0",
"handsontable": "^15.2.0",
"https-browserify": "1.0.0",
"hyperformula": "^2.5.0",
"iconv-lite": "^0.5.0",

View File

@ -139,10 +139,15 @@
[routerLink]="['/']"
class="nav-link"
>
<img class="without-text d-block d-md-none" src="images/dc-logo.svg" />
<img
class="without-text d-block d-md-none"
src="images/dc-logo.svg"
alt="datacontroller logo without text"
/>
<img
class="with-text d-none d-md-block"
src="images/datacontroller.svg"
alt="datacontroller logo"
/>
</a>
@ -283,7 +288,11 @@
<!-- App Loading Page -->
<div *ngIf="!startupDataLoaded" class="app-loading">
<img class="loading-logo" src="images/datacontroller.svg" />
<img
class="loading-logo"
src="images/datacontroller.svg"
alt="datacontroller logo"
/>
<div *ngIf="appActive === null" class="slider">
<div class="line"></div>

View File

@ -98,7 +98,7 @@ header {
}
.nav-link.active {
background: #61717D;
background: #1d2f3d;
}
}
@ -444,4 +444,4 @@ header {
padding: 0rem 0rem 0rem 0rem;
}
}
}

View File

@ -137,6 +137,11 @@
font-size: .541667rem;
margin-right: 6px;
.clr-input-group {
width: 100%;
border: 0;
}
input {
width: 100%;
border: 0;
@ -235,4 +240,4 @@
.validation-info-alert {
width: 310px
}
}

View File

@ -200,6 +200,7 @@
clrTooltipTrigger
(click)="datasetInfo = true"
shape="info-circle"
aria-label="View dataset meta info"
class="is-highlight cursor-pointer"
size="24"
></clr-icon>

View File

@ -225,6 +225,7 @@ hot-table {
.view-table {
font-size: inherit !important;
color: #1a57bb !important;
}
// When width is smaller remove the text from the buttons
@ -243,4 +244,4 @@ hot-table {
// we will remove it if no issues found
// .filter-modal {
// z-index: 1210;
// }
// }

View File

@ -123,11 +123,11 @@
</div>
<div *ngIf="!loading" class="no-table-selected">
<clr-icon
shape="warning-standard"
size="60"
class="is-info icon-dc-fill"
></clr-icon>
<img
src="images/select-table.png"
class="select-table-icon"
alt="select table icon"
/>
<p
*ngIf="treeNodeLibraries?.length! > 0"
class="text-center color-gray mt-10"

View File

@ -127,7 +127,7 @@
class="no-table-selected pointer-events-none"
>
<clr-icon
shape="warning-standard"
shape="upload-cloud"
size="40"
class="is-info icon-dc-fill"
></clr-icon>

View File

@ -89,6 +89,7 @@
<clr-dg-cell class="p-0 d-flex justify-content-center">
<button
class="btn btn-success"
aria-label="Download audit file"
[id]="approveItem.tableId"
(click)="
download(approveItem.tableId); $event.stopPropagation()

View File

@ -24,19 +24,19 @@
<a
*ngIf="ind < 1"
(click)="getTable(approveData[col])"
class="cursor-pointer"
class="cursor-pointer table-link"
>{{ approveData[col] }}</a
>
<div *ngIf="ind < 2 && ind >= 1">
<a
(click)="getBaseTable(approveData[col])"
class="cursor-pointer"
class="cursor-pointer table-link"
>VIEW</a
>
<span> / </span>
<a
(click)="getEditTable(approveData[col])"
class="cursor-pointer"
class="cursor-pointer table-link"
>EDIT</a
>
</div>
@ -47,7 +47,12 @@
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline" (click)="openModal = false">
<button
type="button"
aria-label="Close modal"
class="btn btn-outline"
(click)="openModal = false"
>
OK
</button>
</div>
@ -119,6 +124,7 @@
<clr-dg-cell class="verCenter">{{ historyItem.reviewed }}</clr-dg-cell>
<clr-dg-cell class="verCenter p-0 d-flex justify-content-center">
<button
aria-label="Download audit file"
class="btn btn-success"
(click)="download(historyItem.tableId); $event.stopPropagation()"
>

View File

@ -34,4 +34,9 @@
#noDataContainer {
height: calc(100vh - 200px);
}
}
.table-link {
text-decoration: underline;
font-weight: bold;
}

View File

@ -64,7 +64,11 @@
<!-- <clr-dg-cell>{{sub.approver}}</clr-dg-cell> -->
<clr-dg-cell>{{ sub.submitReason }}</clr-dg-cell>
<clr-dg-cell>
<div class="row justify-content-around" role="tooltip">
<div
class="row justify-content-around"
role="tooltip"
aria-label="Go to staged data screen"
>
<a
class="column-center links tooltip tooltip-md tooltip-bottom-left color-blue"
(click)="goToStage(sub.tableId)"
@ -79,6 +83,7 @@
<clr-dg-cell class="p-0 d-flex justify-content-center">
<button
class="btn btn-success"
aria-label="Download audit file for table record"
(click)="download(sub.tableId); $event.stopPropagation()"
>
<clr-icon shape="download"></clr-icon>

View File

@ -1,13 +1,17 @@
<div class="login-sidebar-wrapper" [class.active]="isActive">
<div class="login-sidebar sideBarProps">
<!--img src="images/data_controller.png" alt=""-->
<img class="login-logo" src="images/datacontroller.svg" alt="" />
<img
class="login-logo"
src="images/datacontroller.svg"
alt="datacontroller logo"
/>
<form class="login" (ngSubmit)="submit()">
<label class="title">
<h3 class="welcome">Welcome to</h3>
Data Controller
<h5 class="hint">Capture, Review, and Approve</h5>
<h4 class="hint">Capture, Review, and Approve</h4>
</label>
<div class="login-group">
<input

View File

@ -111,7 +111,7 @@
}
::ng-deep .login-sidebar-wrapper .login-group {
.clr-control-container, .username, .password {
.clr-control-container, .clr-input-group, .username, .password {
width: 100%;
}
@ -126,4 +126,4 @@
.login-logo {
max-width: 200px
}
}

View File

@ -11,7 +11,7 @@
class="d-flex justify-content-center sub-dropdown"
>
<clr-dropdown>
<button class="dropdown-toggle btn btn-link" clrDropdownTrigger>
<button class="dropdown-toggle btn btn-primary" clrDropdownTrigger>
{{ getSubPage() }}
<clr-icon shape="caret down"></clr-icon>
</button>
@ -113,7 +113,7 @@
class="d-flex justify-content-center sub-dropdown"
>
<clr-dropdown>
<button class="dropdown-toggle btn btn-link" clrDropdownTrigger>
<button class="dropdown-toggle btn btn-primary" clrDropdownTrigger>
{{ getSubPage() }}
<clr-icon shape="caret down"></clr-icon>
</button>

View File

@ -79,4 +79,4 @@ clr-vertical-nav {
bottom: 0;
top: 0;
}
}
}

View File

@ -23,10 +23,13 @@
<app-loading-indicator></app-loading-indicator>
<clr-dropdown class="app-nav-dropdown">
<button class="nav-text color-white" clrDropdownToggle>
<button class="nav-text color-white user-nav-toggle" clrDropdownToggle>
<span>{{ userName }}</span>
<span *ngIf="userName !== 'Not logged in' && isViya"
><img class="avatar-img" src="{{ getPictureUrl() }}" alt=""
><img
class="avatar-img"
src="{{ getPictureUrl() }}"
alt="profile picture"
/></span>
<span
class="badge badge-danger"

View File

@ -19,6 +19,13 @@ $clr-light-gray: #eee;
}
}
.user-nav-toggle {
padding: 0 10px !important;
display: flex;
align-items: center;
height: 100%;
}
.app-nav-dropdown {
//left padding for branding is also 24px
padding-right: 15px;
@ -146,4 +153,4 @@ $clr-light-gray: #eee;
height: 40px;
margin-left: 10px;
border-radius: 50px;
}
}

View File

@ -375,6 +375,7 @@
<clr-icon
clrTooltipTrigger
(click)="datasetInfo = true"
aria-label="View dataset meta info"
shape="info-circle"
class="is-highlight cursor-pointer"
size="24"
@ -480,11 +481,11 @@
*ngIf="!lib && !table && !noDataReqErr && !noData"
class="no-table-selected"
>
<clr-icon
shape="warning-standard"
size="60"
class="is-info icon-dc-fill"
></clr-icon>
<img
src="images/select-library.png"
class="select-table-icon"
alt="select a library icon"
/>
<h3 class="text-center color-gray mt-10" cds-text="section">
Please select a library
</h3>
@ -520,11 +521,11 @@
*ngIf="libinfo !== null"
class="no-table-selected-info pointer-events-none"
>
<clr-icon
shape="info-standard"
size="40"
class="is-info icon-dc-fill"
></clr-icon>
<img
src="images/select-table.png"
class="select-table-icon"
alt="select table icon"
/>
<p class="text-center color-gray mt-10" cds-text="section">
Please select a table
</p>

View File

@ -45,11 +45,11 @@
<div class="content-area">
<div *ngIf="!selectedXLMap" class="no-table-selected">
<clr-icon
shape="warning-standard"
size="60"
class="is-info icon-dc-fill"
></clr-icon>
<img
src="images/select-table.png"
class="select-table-icon"
alt="select table icon"
/>
<p
*ngIf="xlmaps.length > 0"
class="text-center color-gray mt-10"
@ -101,7 +101,7 @@
<i class="d-flex clr-col-12 clr-justify-content-center mt-5-i">{{
selectedXLMap.description
}}</i>
<h5 class="d-flex clr-col-12 clr-justify-content-center mt-5-i">
<p class="d-flex clr-col-12 clr-justify-content-center mt-5-i">
Rules Source:
<a
cds-text="labelLink"
@ -110,8 +110,8 @@
>
{{ rulesSource }}
</a>
</h5>
<h5 class="d-flex clr-col-12 clr-justify-content-center mt-5-i">
</p>
<p class="d-flex clr-col-12 clr-justify-content-center mt-5-i">
Target dataset:
<a
cds-text="labelLink"
@ -120,7 +120,7 @@
>
{{ selectedXLMap.targetDS }}
</a>
</h5>
</p>
</div>
<div class="clr-flex-1">

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -1,5 +1,5 @@
<!doctype html>
<html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>Data Controller</title>

View File

@ -76,6 +76,14 @@ body[cds-theme="light"] {
}
}
.select-table-icon {
width: 80px;
}
.select-library-icon {
width: 80px;
}
[cds-text=label] {
color: var(--cds-global-typography-color-200);
}

View File

@ -13,6 +13,7 @@
"ES2022",
"dom"
],
"skipLibCheck": true,
"module": "ES2022",
"importHelpers": true,
"moduleResolution": "node",

2145
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "dcfrontend",
"version": "6.14.4",
"version": "6.14.6",
"description": "Data Controller",
"devDependencies": {
"@saithodev/semantic-release-gitea": "^2.1.0",

View File

@ -38,6 +38,7 @@
dc_dttmtfmt /* can be overridden in dc_getsettings */
_debug /* automatic variable when provided in URL */
sasjs_mdebug /* used to show extra info when _debug is enabled */
sqlrc /* avoid errors when using DI jobs in HOOK scripts */
;
%if &mpeinit=1 %then %return;