Skip to content
This repository was archived by the owner on Mar 8, 2024. It is now read-only.

Commit 8f840ec

Browse files
lumburovskalinaJWittmeyerSimonDegrafKern
authored
Release updates (#136)
* Dummy commit * Changes slice name * html change * Version number to 1.10.0 * Added label Unknown user if the user that created the project does not exist * Adds check if embedable field is present and if not give feedback in embedding creation modal * Unknown user label --------- Co-authored-by: JWittmeyer <jens.wittmeyer@kern.ai> Co-authored-by: SimonDegrafKern <simon.degraf@kern.ai>
1 parent 40c3519 commit 8f840ec

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

src/app/base/components/export/export-helper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export enum ExportPreset {
2424

2525
export enum ExportRowType {
2626
ALL = "ALL",
27-
DATA_SLICE = "DATA_SLICE",
27+
SLICE = "SLICE", //SLICE is expected from backend, DATA_SLICE can't be used
2828
SESSION = "SESSION"
2929
}
3030

@@ -110,7 +110,7 @@ export class ExportHelper {
110110
let type = this.firstActiveInGroup(ExportEnums.ExportRowType, 'value');
111111
let id;
112112
if (type == ExportRowType.ALL) id = null;
113-
else if (type == ExportRowType.DATA_SLICE) {
113+
else if (type == ExportRowType.SLICE) {
114114
id = this.firstActiveInGroup(ExportEnums.DataSlices, "id");
115115
} else if (type == ExportRowType.SESSION) id = this.baseComponent.sessionId;
116116
return { type: type, id: id };

src/app/base/components/export/export.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<!--Export DataSlices-->
4141
<ng-container [ngTemplateOutlet]="groupDisplay" [ngTemplateOutletContext]="{
4242
type:ExportEnumsType.DataSlices,
43-
hiddenCheckCtrl:formGroups.get(ExportEnumsType.ExportRowType).get('DATA_SLICE').get('active'),
43+
hiddenCheckCtrl:formGroups.get(ExportEnumsType.ExportRowType).get('SLICE').get('active'),
4444
heading:'Export data slice',
4545
subText:null,
4646
isCheckbox:false}">

src/app/base/components/sidebar-pm/sidebar-pm.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<label data-tip="Version overview"
226226
(click)="requestVersionOverview(); sideBarPmModals.versionOverview.open = true;"
227227
class="z-50 tooltip tooltip-right cursor-pointer select-none text-white flex items-center"
228-
id="refineryVersion">v1.9.1
228+
id="refineryVersion">v1.10.0
229229
<svg *ngIf="hasUpdates" xmlns="http://www.w3.org/2000/svg" data-tip="Newer version available"
230230
class="icon icon-tabler icon-tabler-alert-circle inline-block text-yellow-700 tooltip tooltip-right align-top ml-1"
231231
width="16" height="16" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"

src/app/projects/components/project-settings/components/embeddings/embeddings.component.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,17 @@
171171
<kern-modal [isOpen]="settingModals.embedding.create.open" [modalBoxStyle]="{'overflow-x':'visible'}" closeButton="X"
172172
[acceptButton]="{
173173
buttonCaption: 'Add embedding',
174-
disabled: settingModals.embedding.create.blocked || settingModals.embedding.create.embeddingCreationFormGroup?.get('embeddingHandle').value == '',
174+
disabled: settingModals.embedding.create.blocked || settingModals.embedding.create.embeddingCreationFormGroup?.get('embeddingHandle').value == '' || !(useableTextAttributes && settingModals.embedding.create.embeddingCreationFormGroup),
175175
emitObject: this, emitFunction:addEmbedding
176176
}" (optionClicked)="settingModals.embedding.create.open = false">
177177
<div class="flex flex-grow justify-center text-lg leading-6 text-gray-900 font-medium">
178178
Add an embedding </div>
179-
<div class="mb-2 flex flex-grow justify-center text-sm text-gray-500">
179+
<div class="mb-2 flex flex-grow justify-center text-sm text-gray-500"
180+
*ngIf="useableTextAttributes && settingModals.embedding.create.embeddingCreationFormGroup">
180181
Pick from the below solutions to build a vector representation</div>
182+
<div class="mb-2 flex flex-grow justify-center text-sm text-gray-500"
183+
*ngIf="!(useableTextAttributes && settingModals.embedding.create.embeddingCreationFormGroup)">
184+
No usable text attributes to embed exist</div>
181185
<div *ngIf="useableTextAttributes && settingModals.embedding.create.embeddingCreationFormGroup">
182186
<form [formGroup]="settingModals.embedding.create.embeddingCreationFormGroup"
183187
class="grid grid-cols-2 gap-2 items-center" style="grid-template-columns: max-content auto;">

src/app/projects/components/project-settings/project-settings.component.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,5 +375,3 @@ export class ProjectSettingsComponent implements OnInit, OnDestroy {
375375
return this.attributes.some(a => a.state == AttributeCalculationState.RUNNING) || this.checkIfAcUploadedRecords;
376376
}
377377
}
378-
379-

src/app/projects/components/projects/projects.component.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
<div class="absolute top-0 left-2/4 flex flex-row flex-nowrap gap-x-1 bg-gray-100 px-1 rounded-br rounded-bl"
1919
style="transform: translate(-50%);" *ngIf="project.timeStamp">
2020
<span class="text-sm text-gray-500">Created by</span>
21-
<span class="text-sm text-gray-900 tooltip tooltip-bottom text-gray-500"
22-
[attr.data-tip]="project.user.mail">{{project.user.firstName}}
23-
{{project.user.lastName}}</span>
21+
<span class="text-sm text-gray-900"
22+
[ngClass]="project.user.firstName && project.user.lastName ? 'tooltip tooltip-bottom' : ''"
23+
[attr.data-tip]="project.user.mail">
24+
{{project.user.firstName && project.user.lastName ? project.user.firstName + ' ' +
25+
project.user.lastName : unknownUser}}
26+
</span>
2427
<ng-template [ngIf]="!isDemoUser">
2528
<span class="text-sm text-gray-500">on</span>
26-
<span class="text-sm text-gray-900 text-gray-500">{{project.date}}</span>
29+
<span class="text-sm text-gray-900 ">{{project.date}}</span>
2730
<span class="text-sm text-gray-500">at</span>
28-
<span class="text-sm text-gray-900 text-gray-500">{{project.time}}</span>
31+
<span class="text-sm text-gray-900 ">{{project.time}}</span>
2932
</ng-template>
3033
</div>
3134
<div *ngIf="adminData.isAdmin"

src/app/projects/components/projects/projects.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export class ProjectsComponent implements OnInit, OnDestroy {
8080
prjDeleteProject: null as Project,
8181
}
8282
projectsModals: ProjectsModals = createDefaultProjectsModals();
83+
unknownUser: string = '<unknown user>';
8384

8485
constructor(
8586
private projectApolloService: ProjectApolloService,

0 commit comments

Comments
 (0)