Skip to content

Commit 47947d5

Browse files
Sai Krishna MetpalliSai Krishna Metpalli
authored andcommitted
Revert "Merge pull request #931 from bcgov/feature/DSS-1154"
This reverts commit b6d8c06, reversing changes made to ed43417.
1 parent 7940e6a commit 47947d5

File tree

9 files changed

+21
-75
lines changed

9 files changed

+21
-75
lines changed

frontend/nginx.local.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ http {
7979
# See https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
8080
# See https://content-security-policy.com/nonce/
8181
# See https://angular.io/guide/security#content-security-policy
82-
add_header content-security-policy "default-src 'self'; style-src 'self' 'nonce-$cspNonce' 'unsafe-inline'; script-src 'self' 'nonce-$cspNonce'; font-src 'self'; frame-src loginproxy.gov.bc.ca dev.loginproxy.gov.bc.ca test.loginproxy.gov.bc.ca; connect-src 'self' loginproxy.gov.bc.ca dev.loginproxy.gov.bc.ca test.loginproxy.gov.bc.ca server.arcgisonline.com; img-src 'self' https://tile.openstreetmap.org data: server.arcgisonline.com www.w3.org; frame-ancestors https://loginproxy.gov.bc.ca https://dev.loginproxy.gov.bc.ca https://test.loginproxy.gov.bc.ca; object-src 'none'; base-uri 'self'; form-action 'self';";
82+
add_header content-security-policy "default-src 'self'; style-src 'self' 'nonce-$cspNonce' ; script-src 'self' 'nonce-$cspNonce'; font-src 'self'; frame-src loginproxy.gov.bc.ca dev.loginproxy.gov.bc.ca test.loginproxy.gov.bc.ca; connect-src 'self' loginproxy.gov.bc.ca dev.loginproxy.gov.bc.ca test.loginproxy.gov.bc.ca server.arcgisonline.com; img-src 'self' https://tile.openstreetmap.org data: server.arcgisonline.com www.w3.org; frame-ancestors https://loginproxy.gov.bc.ca https://dev.loginproxy.gov.bc.ca https://test.loginproxy.gov.bc.ca; object-src 'none'; base-uri 'self'; form-action 'self';";
8383

8484
include /nginx/nginx.conf;
8585

frontend/src/app/features/components/bulk-compliance-notice/bulk-compliance-notice.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ <h4>All fields are required except where stated.</h4>
1313
size="small" [(selection)]="selectedListings">
1414
<ng-template pTemplate="header">
1515
<tr>
16-
<th class="width-4rem" aria-labelledby="selectAll_checkbox_header">
16+
<th style="width: 4rem" aria-labelledby="selectAll_checkbox_header">
1717
<p-tableHeaderCheckbox id="selectAll_checkbox_header"
1818
ariaLabel="'Select or Deselect All'"></p-tableHeaderCheckbox>
1919
</th>
@@ -140,7 +140,7 @@ <h4>All fields are required except where stated.</h4>
140140
<div class="form-group-row-col">
141141

142142
<p-editor (onTextChange)="onEditorChanged($event)" appendTo="body" #textarea id="comment" name="comment"
143-
placeholder="Optional" formControlName="comment" class="height-320px">
143+
placeholder="Optional" formControlName="comment" [style]="{ height: '320px' }">
144144
<ng-template pTemplate="header">
145145
<span class="ql-formats">
146146
<button type="button" class="ql-bold" aria-label="Bold"></button>
@@ -164,8 +164,8 @@ <h4>All fields are required except where stated.</h4>
164164
(click)="submit()">Review</button>
165165
<button pButton id="cancel-btn" class="outline-btn" (click)="cancel()">Cancel</button>
166166
</div>
167-
<p-dialog class="preview-dialog width-50vw" header="Send Notice of Non-Compliance" [(visible)]="showPreviewDialog" [modal]="true"
168-
[draggable]="false" [resizable]="false">
167+
<p-dialog class="preview-dialog" header="Send Notice of Non-Compliance" [(visible)]="showPreviewDialog" [modal]="true"
168+
[style]="{ width: '50vw' }" [draggable]="false" [resizable]="false">
169169

170170
<div class="note">
171171
<div class="title">

frontend/src/app/features/components/platform-management/platform-management.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ <h2>Manage Platforms</h2>
1010
size="small">
1111
<ng-template pTemplate="header">
1212
<tr>
13-
<th class="width-4rem"></th>
13+
<th style="width: 4rem"></th>
1414
<th class="sortable-header" id="organizationNm_header"
1515
[class.sorted]="this.sort && this.sort.prop === 'organizationNm'"
1616
(click)="onSort('organizationNm')">Platform Name
@@ -58,12 +58,12 @@ <h2>Manage Platforms</h2>
5858
<i class="pi pi-angle-up"
5959
*ngIf="this.sort && this.sort.prop === 'updDtm' && this.sort.dir === 'asc'"></i>
6060
</th>
61-
<th class="width-4rem">Edit</th>
61+
<th style="width: 4rem">Edit</th>
6262
</tr>
6363
</ng-template>
6464
<ng-template pTemplate="body" let-platform let-index="rowIndex" let-expanded="expanded">
6565
<tr>
66-
<td class="width-4rem">
66+
<td style="width: 4rem">
6767
<button [disabled]="!platform.subsidiaries || !platform.subsidiaries.length"
6868
[pRowTogglerDisabled]="!platform.subsidiaries || !platform.subsidiaries.length" pButton
6969
[pTooltip]="(!platform.subsidiaries || !platform.subsidiaries.length)?'Does Not Contain Subsidiary Platforms':'Expand / Collapse'"
@@ -82,7 +82,7 @@ <h2>Manage Platforms</h2>
8282
<td class="status" [class.active]="platform.isActive">
8383
{{platform.isActive?'Active':'Disabled'}}</td>
8484
<td>{{platform.updDtm |date:'yyyy-MM-dd'}}</td>
85-
<td class="width-4rem">
85+
<td style="width: 4rem">
8686
<a id="platform-edit-{{index}}-icon" class="edit-icon"
8787
[routerLink]="'/platform/'+platform.organizationId">
8888
<i class="pi pi-list"></i>

frontend/src/app/features/components/send-compliance-order/send-compliance-order.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h4>Send a message to all hosts of the listings selected below. All fields are r
1212
size="small" [(selection)]="selectedListings">
1313
<ng-template pTemplate="header">
1414
<tr>
15-
<th class="width-4rem">
15+
<th style="width: 4rem">
1616
<p-tableHeaderCheckbox></p-tableHeaderCheckbox>
1717
</th>
1818
<th class="sortable-header" id="offeringOrganizationNm_header"
@@ -98,7 +98,7 @@ <h4>Send a message to all hosts of the listings selected below. All fields are r
9898
</div>
9999
<div class="form-group-row-col">
100100
<p-editor (onTextChange)="onEditorChanged($event)" appendTo="body" id="comment" name="comment"
101-
placeholder="Enter Messages here..." formControlName="comment" class="height-320px">
101+
placeholder="Enter Messages here..." formControlName="comment" [style]="{ height: '320px' }">
102102
<ng-template pTemplate="header">
103103
<span class="ql-formats">
104104
<button type="button" class="ql-bold" aria-label="Bold"></button>
@@ -154,8 +154,8 @@ <h4>Send a message to all hosts of the listings selected below. All fields are r
154154
<button pButton id="cancel-btn" class="outline-btn" (click)="cancel()">Cancel</button>
155155
</div>
156156

157-
<p-dialog class="preview-dialog width-50vw" header="Message to Hosts" [(visible)]="showPreviewDialog" [modal]="true"
158-
[draggable]="false" [resizable]="false">
157+
<p-dialog class="preview-dialog" header="Message to Hosts" [(visible)]="showPreviewDialog" [modal]="true"
158+
[style]="{ width: '50vw' }" [draggable]="false" [resizable]="false">
159159

160160
<div class="note">
161161
<div class="title">

frontend/src/app/features/components/upload-business-license/upload-business-license.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
</div>
144144
</div>
145145

146-
<p-dialog header="Upload Business Licence Data" class="upload-bl-popup width-640px" [modal]="true" [closable]="true"
147-
[(visible)]="isUploadVisible">
146+
<p-dialog header="Upload Business Licence Data" class="upload-bl-popup" [modal]="true" [closable]="true"
147+
[(visible)]="isUploadVisible" [style]="{ width: '640px' }">
148148
<ng-template pTemplate="body">
149149
<div class="row sub-header">Upload Your Business Licence Data (.CSV File Only)</div>
150150
<div class="row file-select" [class.has-file]="selectedFile?.name">

frontend/src/app/features/components/user-management/add-aps-user/add-aps-user.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2>Add APS User Information</h2>
4747
<br>
4848
<a class="link-to-roles" [routerLink]="'/roles'" target="_blank">View All Roles and Permissions</a>
4949
<div class="tags-content">
50-
<p-tag class="tag-light-blue" *ngFor="let tag of tags"
50+
<p-tag [style]="{'background-color':'#D8EAFD', 'color':'#2D2D2D'}" *ngFor="let tag of tags"
5151
[value]="tag"></p-tag>
5252
</div>
5353
</div>

frontend/src/app/features/components/user-management/user-details/user-details.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ <h2>User Information</h2>
8787
<br>
8888
<a class="link-to-roles" [routerLink]="'/roles'" target="_blank">View All Roles and Permissions</a>
8989
<div class="tags-content">
90-
<p-tag class="tag-light-blue" *ngFor="let tag of tags"
90+
<p-tag [style]="{'background-color':'#D8EAFD', 'color':'#2D2D2D'}" *ngFor="let tag of tags"
9191
[value]="tag"></p-tag>
9292
</div>
9393
</div>

frontend/src/app/features/components/user-management/user-management.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@
111111
<td>
112112
<ng-container [ngSwitch]="accessRequest.accessRequestStatusCd">
113113
<ng-container *ngSwitchCase="'Approved'">
114-
<span class="status-approved">Approved</span>
114+
<span [style]="{'color':'#42814A'}">Approved</span>
115115
</ng-container>
116116
<ng-container *ngSwitchCase="'Denied'">
117-
<span class="status-denied">Denied</span>
117+
<span [style]="{'color':'#CE3E39'}">Denied</span>
118118
</ng-container>
119119
<ng-container *ngSwitchCase="'Requested'">
120120
<button pButton name="form-approve-btn" id="form-approve-{{index}}-btn"
@@ -153,7 +153,7 @@
153153
</div>
154154

155155
<p-dialog *ngIf="currentTableItem" id="approve-popup-dialog" header="Approve Access Request" [modal]="true"
156-
[(visible)]="showApprovePopup" class="width-50vw">
156+
[(visible)]="showApprovePopup" [style]="{width: '50vw'}">
157157
<div class="form-group-row"><strong class="bold-text">User Email: </strong>{{currentTableItem.emailAddressDsc}}
158158
</div>
159159
<div class="form-group-row"><strong class="bold-text">ID Provider: </strong>
@@ -193,7 +193,7 @@
193193
</p-dialog>
194194

195195
<p-dialog id="reject-popup-dialog" *ngIf="currentTableItem" header="Reject Access Request" [modal]="true"
196-
[(visible)]="showRejectPopup" class="width-50vw">
196+
[(visible)]="showRejectPopup" [style]="{width: '50vw'}">
197197
<div class="form-group-row-col"><strong class="bold-text">User ID: </strong>{{currentTableItem.emailAddressDsc}}
198198
</div>
199199
<div class="form-group-row-col"><strong class="bold-text">Requested User

frontend/src/styles.scss

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,6 @@ body {
582582
border-bottom-left-radius: 4px;
583583
}
584584
}
585-
586-
&.width-50vw {
587-
width: 50vw !important;
588-
}
589585
}
590586

591587
.p-menubar {
@@ -778,54 +774,4 @@ body {
778774

779775
.ql-tooltip {
780776
left: 1rem !important;
781-
}
782-
783-
/* CSP-compliant utility classes to replace inline styles */
784-
.width-4rem {
785-
width: 4rem !important;
786-
}
787-
788-
.width-2rem {
789-
width: 2rem !important;
790-
}
791-
792-
.width-19rem {
793-
width: 19rem !important;
794-
}
795-
796-
.width-24rem {
797-
width: 24rem !important;
798-
}
799-
800-
.width-50vw {
801-
width: 50vw !important;
802-
}
803-
804-
.width-640px {
805-
width: 640px !important;
806-
}
807-
808-
.text-align-center {
809-
text-align: center !important;
810-
}
811-
812-
.height-320px {
813-
height: 320px !important;
814-
}
815-
816-
.height-320px .p-editor-content {
817-
height: 320px !important;
818-
}
819-
820-
.status-approved {
821-
color: #42814A !important;
822-
}
823-
824-
.status-denied {
825-
color: #CE3E39 !important;
826-
}
827-
828-
.tag-light-blue {
829-
background-color: #D8EAFD !important;
830-
color: #2D2D2D !important;
831777
}

0 commit comments

Comments
 (0)