Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/subject pair dialog component expansion2 #713

Merged
merged 17 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4f74f74
Removed a block of code from build.gradle that was not needed and blo…
Bdegraaf1234 Sep 8, 2023
e9bc5e5
added "NODE_OPTIONS=--openssl-legacy-provider" flag to start script t…
Bdegraaf1234 Sep 8, 2023
07aa65f
Added requested fields from issue #706
Bdegraaf1234 Sep 6, 2023
69a5489
added content to the fields in issue #706 in the liquibase database s…
Bdegraaf1234 Sep 6, 2023
b722d73
added defaultValue to the requested fields in issue #706. This is lik…
Bdegraaf1234 Sep 6, 2023
2c0d942
Merge branch 'fix/build_issues_windows_os2' into feature/subject-pair…
Bdegraaf1234 Sep 8, 2023
bded651
no input requirements, as these are not input fields (https://github.…
Bdegraaf1234 Sep 8, 2023
b30c3c6
Revert "added defaultValue to the requested fields in issue #706. Thi…
Bdegraaf1234 Sep 8, 2023
976340f
set of subjects that has varies permutations of present or absent opt…
Bdegraaf1234 Sep 8, 2023
ddc4d5f
add date of birth and person name to set of subjects in the dev db th…
Bdegraaf1234 Sep 11, 2023
ab0e55b
inserted *ngIf to hide empty input components
Bdegraaf1234 Sep 11, 2023
6a50147
change the subject testing data file so that when ordering by externa…
Bdegraaf1234 Sep 11, 2023
4c39429
Set demo data to only be updated in test and dev mode.
Bdegraaf1234 Sep 11, 2023
6ec4727
add commented out snapshot repository with a comment to prevent clari…
Bdegraaf1234 Sep 11, 2023
d4dd038
Merge branch 'fix/build_issues_windows_os2' into feature/subject-pair…
Bdegraaf1234 Sep 11, 2023
fa94f3a
moved misplaced commented out line and comment
Bdegraaf1234 Sep 11, 2023
89b06c2
Merge branch 'fix/build_issues_windows_os2' into feature/subject-pair…
Bdegraaf1234 Sep 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 2 additions & 25 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ allprojects {

repositories {
mavenCentral()
// maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
Bdegraaf1234 marked this conversation as resolved.
Show resolved Hide resolved
}

idea {
Expand Down Expand Up @@ -97,31 +96,9 @@ springBoot {
buildInfo()
}

if (OperatingSystem.current().isWindows()) {
tasks.register('pathingJar', Jar) {
dependsOn configurations.runtime
archiveAppendix.set('pathing')

doFirst {
manifest {
attributes 'Class-Path': configurations.runtime.files.collect {
it.toURI().toURL().toString().replaceFirst(/file:\/+/, '/').replaceAll(' ', '%20')
}.join(' ')
}
}
}

bootRun {
sourceResources sourceSets.main
dependsOn pathingJar
doFirst {
classpath = files("$buildDir/classes/java/main", "$buildDir/resources/main", pathingJar.archivePath)
}
}
} else {
bootRun {
sourceResources sourceSets.main
}
bootRun {
sourceResources sourceSets.main
}

tasks.withType(KotlinCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"lint": "ng lint",
"lint:fix": "ng lint --fix=true",
"cleanup": "rimraf build/",
"start": "ng serve",
"start": "NODE_OPTIONS=--openssl-legacy-provider ng serve",
"build:prod": "ng build --base-href /managementportal/ --configuration production",
"build:dev": "ng build --configuration development",
"test": "ng test --no-watch --no-progress --browsers=ChromeHeadlessCI",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<databaseChangeLog
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.6.xsd"
>
<changeSet id="update person_name 20230908" author="bastiaan@thehyve.nl">
Bdegraaf1234 marked this conversation as resolved.
Show resolved Hide resolved
<update tableName="subject">
<column name="person_name" value="John Doe" />
<where>ID in (1, 2, 3, 4, 5, 6, 7, 8)</where>
</update>
</changeSet>

<changeSet id="update date_of_birth 20230908" author="bastiaan@thehyve.nl">
<update tableName="subject">
<column name="date_of_birth" value="1999-01-01" />
<where>ID in (1, 2, 3, 4, 9, 10, 11, 12)</where>
</update>
</changeSet>

</databaseChangeLog>
1 change: 1 addition & 0 deletions src/main/resources/config/liquibase/master.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
<include file="classpath:config/liquibase/changelog/20211026000000_extra_demo_data.xml" relativeToChangelogFile="false"/>
<include file="classpath:config/liquibase/changelog/20211110160000_add_organization.xml" relativeToChangelogFile="false"/>
<include file="classpath:config/liquibase/changelog/20211202145000_add_organization_demo_data.xml" relativeToChangelogFile="false"/>
<include file="classpath:config/liquibase/changelog/20230908103500_expand_subject_demo_data_name_dob.xml" relativeToChangelogFile="false"/>
<!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints changelogs here -->
</databaseChangeLog>
104 changes: 52 additions & 52 deletions src/main/resources/config/liquibase/subject.csv
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
"ID";"EXTERNAL_LINK";"EXTERNAL_ID";"REMOVED";"USER_ID";"created_by"
"1";;;"FALSE";"2";"system"
"2";;;"FALSE";"3";"system"
"3";;;"FALSE";"4";"system"
"4";;;"FALSE";"7";"system"
"5";;;"FALSE";"8";"system"
"6";;;"FALSE";"9";"system"
"7";;;"FALSE";"10";"system"
"8";;;"FALSE";"11";"system"
"9";;;"FALSE";"12";"system"
"10";;;"FALSE";"13";"system"
"11";;;"FALSE";"14";"system"
"12";;;"FALSE";"15";"system"
"13";;;"FALSE";"16";"system"
"14";;;"FALSE";"17";"system"
"15";;;"FALSE";"18";"system"
"16";;;"FALSE";"19";"system"
"17";;;"FALSE";"20";"system"
"18";;;"FALSE";"21";"system"
"19";;;"FALSE";"22";"system"
"20";;;"FALSE";"23";"system"
"21";;;"FALSE";"24";"system"
"22";;;"FALSE";"25";"system"
"23";;;"FALSE";"26";"system"
"24";;;"FALSE";"27";"system"
"25";;;"FALSE";"28";"system"
"26";;;"FALSE";"29";"system"
"27";;;"FALSE";"30";"system"
"28";;;"FALSE";"31";"system"
"29";;;"FALSE";"32";"system"
"30";;;"FALSE";"33";"system"
"31";;;"FALSE";"34";"system"
"32";;;"FALSE";"35";"system"
"33";;;"FALSE";"36";"system"
"34";;;"FALSE";"37";"system"
"35";;;"FALSE";"38";"system"
"36";;;"FALSE";"39";"system"
"37";;;"FALSE";"40";"system"
"38";;;"FALSE";"41";"system"
"39";;;"FALSE";"42";"system"
"40";;;"FALSE";"43";"system"
"41";;;"FALSE";"44";"system"
"42";;;"FALSE";"45";"system"
"43";;;"FALSE";"46";"system"
"44";;;"FALSE";"47";"system"
"45";;;"FALSE";"48";"system"
"46";;;"FALSE";"49";"system"
"47";;;"FALSE";"50";"system"
"48";;;"FALSE";"51";"system"
"49";;;"FALSE";"52";"system"
"50";;;"FALSE";"53";"system"
"51";;;"FALSE";"54";"system"
ID;EXTERNAL_LINK;EXTERNAL_ID;REMOVED;USER_ID;created_by
1;;;FALSE;2;system
2;EXT_LINK_1;EXT_ID_1;FALSE;3;system
3;;EXT_ID_2;FALSE;4;system
4;EXT_LINK_3;;FALSE;7;system
5;;;FALSE;8;system
6;EXT_LINK_5;EXT_ID_5;FALSE;9;system
7;;EXT_ID_6;FALSE;10;system
8;EXT_LINK_7;;FALSE;11;system
9;;;FALSE;12;system
10;EXT_LINK_9;EXT_ID_9;FALSE;13;system
11;;EXT_ID_10;FALSE;14;system
12;EXT_LINK_11;;FALSE;15;system
13;;;FALSE;16;system
14;EXT_LINK_13;EXT_ID_13;FALSE;17;system
15;;EXT_ID_14;FALSE;18;system
16;EXT_LINK_15;;FALSE;19;system
17;;;FALSE;20;system
18;EXT_LINK_17;EXT_ID_17;FALSE;21;system
19;;EXT_ID_18;FALSE;22;system
20;EXT_LINK_19;;FALSE;23;system
21;;;FALSE;24;system
22;EXT_LINK_21;EXT_ID_21;FALSE;25;system
23;;EXT_ID_22;FALSE;26;system
24;EXT_LINK_23;;FALSE;27;system
25;;;FALSE;28;system
26;EXT_LINK_25;EXT_ID_25;FALSE;29;system
27;;EXT_ID_26;FALSE;30;system
28;EXT_LINK_27;;FALSE;31;system
29;;;FALSE;32;system
30;EXT_LINK_29;EXT_ID_29;FALSE;33;system
31;;EXT_ID_30;FALSE;34;system
32;EXT_LINK_31;;FALSE;35;system
33;;;FALSE;36;system
34;EXT_LINK_33;EXT_ID_33;FALSE;37;system
35;;EXT_ID_34;FALSE;38;system
36;EXT_LINK_35;;FALSE;39;system
37;;;FALSE;40;system
38;EXT_LINK_37;EXT_ID_37;FALSE;41;system
39;;EXT_ID_38;FALSE;42;system
40;EXT_LINK_39;;FALSE;43;system
41;;;FALSE;44;system
42;EXT_LINK_41;EXT_ID_41;FALSE;45;system
43;;EXT_ID_42;FALSE;46;system
44;EXT_LINK_43;;FALSE;47;system
45;;;FALSE;48;system
46;EXT_LINK_45;EXT_ID_45;FALSE;49;system
47;;EXT_ID_46;FALSE;50;system
48;EXT_LINK_47;;FALSE;51;system
49;;;FALSE;52;system
50;EXT_LINK_49;EXT_ID_49;FALSE;53;system
51;;EXT_ID_50;FALSE;54;system
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,66 @@
[translate]="'managementPortalApp.subject.home.pairAppLabel'">
</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"
(click)="clear()">&times;</button>
(click)="clear()">&times;
</button>
</div>
<div class="modal-body">
<div class="form-group">
<label for="login" class="form-control-label"
[translate]="'managementPortalApp.subject.login'">
</label>
<input id="login" type="text" class="form-control" name="login" #loginInput="ngModel"
[(ngModel)]="subject.login" required minlength=1 maxlength=50 pattern="^[_'.@A-Za-z0-9- ]*$" [disabled]="subject.id">
blootsvoets marked this conversation as resolved.
Show resolved Hide resolved
<div>
<label for="login" class="form-control-label"
[translate]="'managementPortalApp.subject.login'">
</label>
<input id="login" type="text" class="form-control" name="login" #loginInput="ngModel"
[(ngModel)]="subject.login" [disabled]="subject.id" >
</div>

<div *ngIf="subject.externalId" >
<label for="externalId" class="form-control-label"
[translate]="'managementPortalApp.subject.externalId'">
</label>
<input id="externalId" type="text" class="form-control" name="externalId" #loginInput="ngModel"
[(ngModel)]="subject.externalId" [disabled]="subject.id" >
</div>

<div *ngIf="subject.personName" >
<label for="name" class="form-control-label"
[translate]="'managementPortalApp.subject.personName'">
</label>
<input id="name" type="text" class="form-control" name="name" #loginInput="ngModel"
[(ngModel)]="subject.personName" [disabled]="subject.id">
</div>

<div *ngIf="subject.dateOfBirth" >
<label for="dateOfBirth" class="form-control-label"
[translate]="'managementPortalApp.subject.dateOfBirth'">
</label>
<input id="dateOfBirth" type="text" class="form-control" name="dateOfBirth" #loginInput="ngModel"
[(ngModel)]="subject.dateOfBirth" [disabled]="subject.id">
</div>


</div>

<div class="form-group">
<label [translate]="'managementPortalApp.subject.clientApp'" for="field_clientApp"></label>
<select class="form-control" id="field_clientApp" name="client" [(ngModel)]="selectedClient" (change)="unsetPairing()" required>
<select class="form-control" id="field_clientApp" name="client" [(ngModel)]="selectedClient"
(change)="unsetPairing()" required>
<option [ngValue]="null" selected></option>
<option [ngValue]="clientOption" *ngFor="let clientOption of oauthClients; trackBy: trackOAuthClientById">{{clientOption.clientId}}</option>
<option [ngValue]="clientOption"
*ngFor="let clientOption of oauthClients; trackBy: trackOAuthClientById">{{clientOption.clientId}}</option>
</select>
</div>

<div class="form-group">
<button type="button" class="btn btn-primary" (click)="generateQRCode(false)" [disabled]="selectedClient === null">
<span class="fa fa-hourglass-start"></span>&nbsp;<span [translate]="'managementPortalApp.subject.generateToken'"></span>
<button type="button" class="btn btn-primary" (click)="generateQRCode(false)"
[disabled]="selectedClient === null">
<span class="fa fa-hourglass-start"></span>&nbsp;<span
[translate]="'managementPortalApp.subject.generateToken'"></span>
</button>
<button *ngIf="allowPersistentToken" type="button" class="btn btn-default" (click)="generateQRCode(true)" [disabled]="selectedClient === null">
<span class="fa fa-save"></span> <span [translate]="'managementPortalApp.subject.generatePersistentToken'"></span>
<button *ngIf="allowPersistentToken" type="button" class="btn btn-default" (click)="generateQRCode(true)"
[disabled]="selectedClient === null">
<span class="fa fa-save"></span> <span
[translate]="'managementPortalApp.subject.generatePersistentToken'"></span>
</button>
</div>

Expand All @@ -43,7 +78,7 @@
<div class="form-group" *ngIf="pairInfo !== null">
<table class="table table-striped">
<tbody>
<tr >
<tr>
<th><span [translate]="'managementPortalApp.subject.baseUrl'"></span></th>
<td>{{pairInfo.baseUrl}}</td>
</tr>
Expand Down