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

Commit

Permalink
Release updates (#136)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people committed May 10, 2023
1 parent 40c3519 commit 8f840ec
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/app/base/components/export/export-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export enum ExportPreset {

export enum ExportRowType {
ALL = "ALL",
DATA_SLICE = "DATA_SLICE",
SLICE = "SLICE", //SLICE is expected from backend, DATA_SLICE can't be used
SESSION = "SESSION"
}

Expand Down Expand Up @@ -110,7 +110,7 @@ export class ExportHelper {
let type = this.firstActiveInGroup(ExportEnums.ExportRowType, 'value');
let id;
if (type == ExportRowType.ALL) id = null;
else if (type == ExportRowType.DATA_SLICE) {
else if (type == ExportRowType.SLICE) {
id = this.firstActiveInGroup(ExportEnums.DataSlices, "id");
} else if (type == ExportRowType.SESSION) id = this.baseComponent.sessionId;
return { type: type, id: id };
Expand Down
2 changes: 1 addition & 1 deletion src/app/base/components/export/export.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<!--Export DataSlices-->
<ng-container [ngTemplateOutlet]="groupDisplay" [ngTemplateOutletContext]="{
type:ExportEnumsType.DataSlices,
hiddenCheckCtrl:formGroups.get(ExportEnumsType.ExportRowType).get('DATA_SLICE').get('active'),
hiddenCheckCtrl:formGroups.get(ExportEnumsType.ExportRowType).get('SLICE').get('active'),
heading:'Export data slice',
subText:null,
isCheckbox:false}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<label data-tip="Version overview"
(click)="requestVersionOverview(); sideBarPmModals.versionOverview.open = true;"
class="z-50 tooltip tooltip-right cursor-pointer select-none text-white flex items-center"
id="refineryVersion">v1.9.1
id="refineryVersion">v1.10.0
<svg *ngIf="hasUpdates" xmlns="http://www.w3.org/2000/svg" data-tip="Newer version available"
class="icon icon-tabler icon-tabler-alert-circle inline-block text-yellow-700 tooltip tooltip-right align-top ml-1"
width="16" height="16" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,17 @@
<kern-modal [isOpen]="settingModals.embedding.create.open" [modalBoxStyle]="{'overflow-x':'visible'}" closeButton="X"
[acceptButton]="{
buttonCaption: 'Add embedding',
disabled: settingModals.embedding.create.blocked || settingModals.embedding.create.embeddingCreationFormGroup?.get('embeddingHandle').value == '',
disabled: settingModals.embedding.create.blocked || settingModals.embedding.create.embeddingCreationFormGroup?.get('embeddingHandle').value == '' || !(useableTextAttributes && settingModals.embedding.create.embeddingCreationFormGroup),
emitObject: this, emitFunction:addEmbedding
}" (optionClicked)="settingModals.embedding.create.open = false">
<div class="flex flex-grow justify-center text-lg leading-6 text-gray-900 font-medium">
Add an embedding </div>
<div class="mb-2 flex flex-grow justify-center text-sm text-gray-500">
<div class="mb-2 flex flex-grow justify-center text-sm text-gray-500"
*ngIf="useableTextAttributes && settingModals.embedding.create.embeddingCreationFormGroup">
Pick from the below solutions to build a vector representation</div>
<div class="mb-2 flex flex-grow justify-center text-sm text-gray-500"
*ngIf="!(useableTextAttributes && settingModals.embedding.create.embeddingCreationFormGroup)">
No usable text attributes to embed exist</div>
<div *ngIf="useableTextAttributes && settingModals.embedding.create.embeddingCreationFormGroup">
<form [formGroup]="settingModals.embedding.create.embeddingCreationFormGroup"
class="grid grid-cols-2 gap-2 items-center" style="grid-template-columns: max-content auto;">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,5 +375,3 @@ export class ProjectSettingsComponent implements OnInit, OnDestroy {
return this.attributes.some(a => a.state == AttributeCalculationState.RUNNING) || this.checkIfAcUploadedRecords;
}
}


13 changes: 8 additions & 5 deletions src/app/projects/components/projects/projects.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
<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"
style="transform: translate(-50%);" *ngIf="project.timeStamp">
<span class="text-sm text-gray-500">Created by</span>
<span class="text-sm text-gray-900 tooltip tooltip-bottom text-gray-500"
[attr.data-tip]="project.user.mail">{{project.user.firstName}}
{{project.user.lastName}}</span>
<span class="text-sm text-gray-900"
[ngClass]="project.user.firstName && project.user.lastName ? 'tooltip tooltip-bottom' : ''"
[attr.data-tip]="project.user.mail">
{{project.user.firstName && project.user.lastName ? project.user.firstName + ' ' +
project.user.lastName : unknownUser}}
</span>
<ng-template [ngIf]="!isDemoUser">
<span class="text-sm text-gray-500">on</span>
<span class="text-sm text-gray-900 text-gray-500">{{project.date}}</span>
<span class="text-sm text-gray-900 ">{{project.date}}</span>
<span class="text-sm text-gray-500">at</span>
<span class="text-sm text-gray-900 text-gray-500">{{project.time}}</span>
<span class="text-sm text-gray-900 ">{{project.time}}</span>
</ng-template>
</div>
<div *ngIf="adminData.isAdmin"
Expand Down
1 change: 1 addition & 0 deletions src/app/projects/components/projects/projects.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export class ProjectsComponent implements OnInit, OnDestroy {
prjDeleteProject: null as Project,
}
projectsModals: ProjectsModals = createDefaultProjectsModals();
unknownUser: string = '<unknown user>';

constructor(
private projectApolloService: ProjectApolloService,
Expand Down

0 comments on commit 8f840ec

Please sign in to comment.