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

Commit d7822c1

Browse files
Release prepararations (#158)
* Refinery version to 1.12.0 * Edit records - background colors for new and old values * Tooltip for switching view * Edit record error max width * Icon for Synchronize with DB button on edit records * Project title is not automatically set when we upload file * Removed scope on personal access page * Positioning columns in edit records * Do not display embedding lists as part of the target attributes * Release preparations * bricks integrator, no default values for embedding name --------- Co-authored-by: FelixKirschKern <felix.kirsch@kern.ai>
1 parent 554109a commit d7822c1

File tree

11 files changed

+152
-148
lines changed

11 files changed

+152
-148
lines changed

src/app/base/components/bricks-integrator/helper/code-parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export class BricksCodeParser {
105105
if (inputV.optional) variable.optional = isStringTrue(inputV.optional);
106106
if (inputV.acceptsMultiple) variable.canMultipleValues = isStringTrue(inputV.acceptsMultiple);
107107
if (inputV.defaultValue && inputV.addInfo) {
108-
if (!inputV.addInfo.some(x => !canHaveDefaultValue(x.toUpperCase() as BricksVariableType))) {
108+
if (!inputV.addInfo.some(x => !canHaveDefaultValue(x.toUpperCase() as BricksVariableType)) && canHaveDefaultValue(variable.type)) {
109109
variable.values[0] = inputV.defaultValue;
110110
}
111111
}

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.11.0
228+
id="refineryVersion">v1.12.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/edit-records/components/edit-records-helper.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export type EditRecordComponentData = {
4040
}
4141
}
4242
},
43-
4443
}
4544

4645
export function createDefaultEditRecordComponentData(): EditRecordComponentData {

src/app/edit-records/components/edit-records.component.html

Lines changed: 134 additions & 125 deletions
Large diffs are not rendered by default.

src/app/edit-records/components/edit-records.component.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,14 @@
3838

3939
.line-height-textarea {
4040
line-height: 16px;
41+
}
42+
43+
.item {
44+
margin-bottom: 20px;
45+
min-width: 410px;
46+
break-inside: avoid-column;
47+
-webkit-column-break-inside: avoid;
48+
-moz-column-break-inside: avoid;
49+
-moz-page-break-inside: avoid;
50+
page-break-inside: avoid;
4151
}

src/app/edit-records/components/edit-records.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export class EditRecordsComponent implements OnInit, OnDestroy, CanDeactivateGua
8282
case "grid-cols-1": this.erd.columnClass = "grid-cols-2"; break;
8383
case "grid-cols-2": this.erd.columnClass = "grid-cols-3"; break;
8484
case "grid-cols-3": this.erd.columnClass = "grid-cols-1"; break;
85-
default: this.erd.columnClass = "grid-cols-3";
85+
default: this.erd.columnClass = "grid-cols-3"; break;
8686
}
8787

8888
localStorage.setItem("ERcolumnClass", this.erd.columnClass);

src/app/import/components/modal-upload/modal-upload.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ export class ModalUploadComponent implements OnInit, OnChanges {
6767

6868
setFile(file: File): void {
6969
this.file = file;
70-
if (this.file) {
71-
if (this.projectName === '') this.projectName = this.file.name.split('.')[0];
72-
} else {
73-
this.projectName = '';
74-
}
7570
this.uploadOptions.projectName = this.projectName;
7671
this.checkIfProjectNameDuplicate();
7772
}

src/app/project-admin/component/project-admin.component.html

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
</kern-modal>
109109

110110
<kern-modal [isOpen]="modals.createTokenOpen"
111-
(optionClicked)="$event == 'CLOSE' ? closeTokenModal() : createPersonalAccessToken(tokenName.value,tokenExpirationTime.value, tokenScope.value); tokenName.value = '';"
111+
(optionClicked)="$event == 'CLOSE' ? closeTokenModal() : createPersonalAccessToken(tokenName.value,tokenExpirationTime.value); tokenName.value = '';"
112112
closeButton="X" [acceptButton]="{
113113
buttonCaption:'Add token',
114114
disabled: tokenName.value.trim() == '' || tokenNameIsDuplicated,
@@ -123,14 +123,6 @@
123123
</div>
124124
</div>
125125
<div class="grid grid-cols-2 gap-2 items-center max-w-sm" style="grid-template-columns: max-content auto;">
126-
<div class="tooltip tooltip-right" data-tip="Choose scope of your token">
127-
<span class="cursor-help card-title mb-0 label-text flex"><span class="underline"
128-
style="text-decoration-style: dotted;text-underline-offset: 2px;text-decoration-color: #22c55e">Scope</span></span>
129-
</div>
130-
<select #tokenScope class="select select-bordered select-sm">
131-
<option value="READ" selected="selected">Read only</option>
132-
<option value="READ_WRITE">Read and write</option>
133-
</select>
134126
<div class="tooltip tooltip-right" data-tip="Choose expiration time of your token">
135127
<span class="cursor-help card-title mb-0 label-text flex"><span class="underline"
136128
style="text-decoration-style: dotted;text-underline-offset: 2px;text-decoration-color: #22c55e">Expiration

src/app/project-admin/component/project-admin.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { copyToClipboard } from 'submodules/javascript-functions/general';
1515
templateUrl: './project-admin.component.html',
1616
styleUrls: ['./project-admin.component.scss']
1717
})
18-
1918
export class ProjectAdminComponent implements OnInit, OnDestroy {
2019

2120
projectName = new FormControl('');
@@ -27,7 +26,6 @@ export class ProjectAdminComponent implements OnInit, OnDestroy {
2726
tokenNameIsDuplicated: boolean;
2827
subscriptions$: Subscription[] = [];
2928

30-
3129
modals = {
3230
deleteTokenOpen: false,
3331
deleteTokenContainerId: null,
@@ -98,7 +96,8 @@ export class ProjectAdminComponent implements OnInit, OnDestroy {
9896
.pipe(first()).subscribe();
9997
}
10098

101-
createPersonalAccessToken(name: string, expiresAt: string, scope: string) {
99+
createPersonalAccessToken(name: string, expiresAt: string) {
100+
const scope = "READ_WRITE";
102101
if (!this.isTokenNameDuplicated(name)) this.projectApolloService.createPersonalAccessToken(this.projectId, name, expiresAt, scope).pipe(first()).subscribe((token) => this.newToken = token);
103102
}
104103

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export class ProjectSettingsComponent implements OnInit, OnDestroy {
146146
this.embeddings = jsonCopy(this.combineLatestResultBackup[1]);
147147
this.dataHandlerHelper.extendQueuedEmbeddings(projectId, this.embeddings);
148148

149-
this.useableAttributes = this.attributes.filter((attribute: any) => (attribute.state == AttributeCalculationState.UPLOADED || attribute.state == AttributeCalculationState.AUTOMATICALLY_CREATED || attribute.state == AttributeCalculationState.USABLE));
149+
this.useableAttributes = this.attributes.filter((attribute: any) => (attribute.state == AttributeCalculationState.UPLOADED || attribute.state == AttributeCalculationState.AUTOMATICALLY_CREATED || attribute.state == AttributeCalculationState.USABLE) && attribute.dataType != 'EMBEDDING_LIST');
150150
this.useableNonTextAttributes = this.useableAttributes.filter((attribute: any) => attribute.dataType != 'TEXT' && attribute.dataType != 'EMBEDDING_LIST');
151151

152152
// prepare embedding suggestions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ng-container *ngTemplateOutlet="buttonsProject"></ng-container>
1212
</div>
1313

14-
<div *ngIf="!organizationInactive && projects.length > 0" class="h-screen overflow-y-scroll mt-3">
14+
<div *ngIf="!organizationInactive && projects.length > 0" class="h-screen mt-3">
1515
<div class="scrollable-size">
1616
<div *ngFor="let project of projects" class="relative card shadow bg-white m-4">
1717
<div *ngIf="project.status != ProjectStatusType.IN_DELETION" class="card-body p-6">

0 commit comments

Comments
 (0)