Skip to content

Commit

Permalink
Merge pull request #57 from UST-QuAntiL/fix/rename-dialog-files
Browse files Browse the repository at this point in the history
rename dialog files
  • Loading branch information
infacc authored Aug 18, 2023
2 parents 5f7d9d2 + 66ef1cc commit a7b8123
Show file tree
Hide file tree
Showing 31 changed files with 36 additions and 205 deletions.
18 changes: 9 additions & 9 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ import { SubstepsDetailsComponent } from './components/substeps-details/substeps
import { TimelineStepNavComponent } from './components/timeline-step-nav/timeline-step-nav.component';
import { TimelineStepComponent } from './components/timeline-step/timeline-step.component';
import { TimelineSubstepsComponent } from './components/timeline-substeps/timeline-substeps.component';
import { ChooseDataComponent } from './dialogs/choose-data/choose-data.component';
import { ChoosePluginComponent } from './dialogs/choose-plugin/choose-plugin.component';
import { CreateExperimentDialog } from './dialogs/create-experiment/create-experiment.component';
import { ChooseDataDialog } from './dialogs/choose-data/choose-data.dialog';
import { ChoosePluginDialog } from './dialogs/choose-plugin/choose-plugin.dialog';
import { CreateExperimentDialog } from './dialogs/create-experiment/create-experiment.dialog';
import { DeleteDialog } from './dialogs/delete-dialog/delete-dialog.dialog';
import { ExportExperimentDialog } from './dialogs/export-experiment/export-experiment.component';
import { MarkdownHelpDialog } from './dialogs/markdown-help/markdown-help.component';
import { ChangeUiTemplateComponent } from './dialogs/change-ui-template/change-ui-template.component';
import { ExportExperimentDialog } from './dialogs/export-experiment/export-experiment.dialog';
import { MarkdownHelpDialog } from './dialogs/markdown-help/markdown-help.dialog';
import { ChangeUiTemplateDialog } from './dialogs/change-ui-template/change-ui-template.dialog';
import { ReactiveFormsModule } from '@angular/forms';
import { TemplateDetailsComponent } from './components-small/template-details/template-details.component';
import { ExperimentWorkspaceDetailComponent } from './components/experiment-workspace-detail/experiment-workspace-detail.component';
Expand All @@ -106,8 +106,8 @@ import { ChooseTemplateDialog } from './dialogs/choose-template/choose-template.
PreviewListComponent,
MarkdownComponent,
PluginUiframeComponent,
ChooseDataComponent,
ChoosePluginComponent,
ChooseDataDialog,
ChoosePluginDialog,
TimelineSubstepsComponent,
SubstepsDetailsComponent,
StepStatusComponent,
Expand All @@ -125,7 +125,7 @@ import { ChooseTemplateDialog } from './dialogs/choose-template/choose-template.
RawTextPreviewComponent,
PluginPreviewComponent,
PluginTabComponent,
ChangeUiTemplateComponent,
ChangeUiTemplateDialog,
TemplateDetailsComponent,
ExperimentWorkspaceDetailComponent,
ImportExperimentComponent,
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/experiment/experiment.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, Router } from '@angular/router';
import { BehaviorSubject, Subscription } from 'rxjs';
import { debounceTime, filter, map } from 'rxjs/operators';
import { ExportExperimentDialog } from 'src/app/dialogs/export-experiment/export-experiment.component';
import { ExportExperimentDialog } from 'src/app/dialogs/export-experiment/export-experiment.dialog';
import { ChooseTemplateDialog } from 'src/app/dialogs/choose-template/choose-template.dialog';
import { CurrentExperimentService } from 'src/app/services/current-experiment.service';
import { ExperimentApiObject, QhanaBackendService } from 'src/app/services/qhana-backend.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PageEvent } from '@angular/material/paginator';
import { Router } from '@angular/router';
import { Observable, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
import { CreateExperimentDialog } from 'src/app/dialogs/create-experiment/create-experiment.component';
import { CreateExperimentDialog } from 'src/app/dialogs/create-experiment/create-experiment.dialog';
import { CurrentExperimentService } from 'src/app/services/current-experiment.service';
import { ExperimentApiObject, QhanaBackendService } from 'src/app/services/qhana-backend.service';

Expand Down
2 changes: 1 addition & 1 deletion src/app/components/markdown/markdown.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { tooltip } from '@milkdown/plugin-tooltip';
import { gfm } from '@milkdown/preset-gfm';
import { EditorState, liftListItem, MarkType, redo, setBlockType, sinkListItem, TextSelection, undo, wrapIn } from '@milkdown/prose';
import { forceUpdate, replaceAll } from '@milkdown/utils';
import { MarkdownHelpDialog } from 'src/app/dialogs/markdown-help/markdown-help.component';
import { MarkdownHelpDialog } from 'src/app/dialogs/markdown-help/markdown-help.dialog';
import { QhanaBackendService } from 'src/app/services/qhana-backend.service';
import { latex, latexNode } from './milkdown-latex';
import { QhanaTheme } from './milkdown-utils';
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/plugin-sidebar/plugin-sidebar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs';
import { filter } from 'rxjs/operators';
import { ChangeUiTemplateComponent } from 'src/app/dialogs/change-ui-template/change-ui-template.component';
import { ChangeUiTemplateDialog } from 'src/app/dialogs/change-ui-template/change-ui-template.dialog';
import { DeleteDialog } from 'src/app/dialogs/delete-dialog/delete-dialog.dialog';
import { ApiLink, ApiResponse, CollectionApiObject, PageApiObject } from 'src/app/services/api-data-types';
import { PluginRegistryBaseService } from 'src/app/services/registry.service';
Expand Down Expand Up @@ -426,7 +426,7 @@ export class PluginSidebarComponent implements OnInit, OnDestroy {
}

async createTemplate() {
const dialogRef = this.dialog.open(ChangeUiTemplateComponent, { data: { template: null }, minWidth: "20rem", maxWidth: "40rem", width: "60%" });
const dialogRef = this.dialog.open(ChangeUiTemplateDialog, { data: { template: null }, minWidth: "20rem", maxWidth: "40rem", width: "60%" });
const templateData: TemplateApiObject = await dialogRef.afterClosed().toPromise();

if (!templateData) {
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/plugin-uiframe/plugin-uiframe.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { ActivatedRoute } from '@angular/router';
import { Observable, of } from 'rxjs';
import { concatAll, filter, map, mergeAll, toArray } from 'rxjs/operators';
import { ChooseDataComponent } from 'src/app/dialogs/choose-data/choose-data.component';
import { ChoosePluginComponent } from 'src/app/dialogs/choose-plugin/choose-plugin.component';
import { ChooseDataDialog } from 'src/app/dialogs/choose-data/choose-data.dialog';
import { ChoosePluginDialog } from 'src/app/dialogs/choose-plugin/choose-plugin.dialog';
import { CollectionApiObject } from 'src/app/services/api-data-types';
import { PluginApiObject } from 'src/app/services/qhana-api-data-types';
import { ApiObjectList, ExperimentDataApiObject, QhanaBackendService } from 'src/app/services/qhana-backend.service';
Expand Down Expand Up @@ -214,7 +214,7 @@ export class PluginUiframeComponent implements OnChanges, OnDestroy {
return; // only ever show one dialog at a time
}
this.dialogActive = true;
const dialogRef = this.dialog.open(ChoosePluginComponent, { data: request });
const dialogRef = this.dialog.open(ChoosePluginDialog, { data: request });
dialogRef.afterClosed().subscribe((result: PluginApiObject | null) => {
this.dialogActive = false;
if (result == null) {
Expand All @@ -235,7 +235,7 @@ export class PluginUiframeComponent implements OnChanges, OnDestroy {
return; // only ever show one dialog at a time
}
this.dialogActive = true;
const dialogRef = this.dialog.open(ChooseDataComponent, { data: { acceptedDataType: request.acceptedInputType, acceptedContentTypes: request.acceptedContentTypes } });
const dialogRef = this.dialog.open(ChooseDataDialog, { data: { acceptedDataType: request.acceptedInputType, acceptedContentTypes: request.acceptedContentTypes } });
dialogRef.afterClosed().subscribe((result: ExperimentDataApiObject) => {
this.dialogActive = false;
if (result == null) {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import { TemplateApiObject } from 'src/app/services/templates.service';

@Component({
selector: 'qhana-change-ui-template',
templateUrl: './change-ui-template.component.html',
styleUrls: ['./change-ui-template.component.sass'],
templateUrl: './change-ui-template.dialog.html',
styleUrls: ['./change-ui-template.dialog.sass'],
})
export class ChangeUiTemplateComponent implements OnInit {
export class ChangeUiTemplateDialog implements OnInit {

templateName: string = "";
templateDescription: string = "";
templateTags: string[] = [];
tagName: string = "";

constructor(public dialogRef: MatDialogRef<ChangeUiTemplateComponent>, @Inject(MAT_DIALOG_DATA) public data: { template: TemplateApiObject | null }) { }
constructor(public dialogRef: MatDialogRef<ChangeUiTemplateDialog>, @Inject(MAT_DIALOG_DATA) public data: { template: TemplateApiObject | null }) { }

ngOnInit(): void {
this.templateName = this.data.template?.name || "";
Expand Down
25 changes: 0 additions & 25 deletions src/app/dialogs/choose-data/choose-data.component.spec.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import { ApiObjectList, ExperimentDataApiObject, QhanaBackendService } from 'src

@Component({
selector: 'qhana-choose-data',
templateUrl: './choose-data.component.html',
styleUrls: ['./choose-data.component.sass']
templateUrl: './choose-data.dialog.html',
styleUrls: ['./choose-data.dialog.sass']
})
export class ChooseDataComponent implements OnInit {
export class ChooseDataDialog implements OnInit {

experimentId: string | null = null;

Expand All @@ -34,7 +34,7 @@ export class ChooseDataComponent implements OnInit {

selected: ExperimentDataApiObject | null = null;

constructor(public dialogRef: MatDialogRef<ChooseDataComponent>, @Inject(MAT_DIALOG_DATA) public data: { acceptedDataType: string, acceptedContentTypes: string[] }, private experiment: CurrentExperimentService, private backend: QhanaBackendService) { }
constructor(public dialogRef: MatDialogRef<ChooseDataDialog>, @Inject(MAT_DIALOG_DATA) public data: { acceptedDataType: string, acceptedContentTypes: string[] }, private experiment: CurrentExperimentService, private backend: QhanaBackendService) { }

ngOnInit(): void {
this.acceptedDataTypeMatcher = this.getMimetypeLikeMatcher(this.data.acceptedDataType);
Expand Down
25 changes: 0 additions & 25 deletions src/app/dialogs/choose-plugin/choose-plugin.component.spec.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ interface PluginRestrictions {

@Component({
selector: 'qhana-choose-plugin',
templateUrl: './choose-plugin.component.html',
styleUrls: ['./choose-plugin.component.sass']
templateUrl: './choose-plugin.dialog.html',
styleUrls: ['./choose-plugin.dialog.sass']
})
export class ChoosePluginComponent {
export class ChoosePluginDialog {

highlightedPluginSet: Set<string> = new Set();
selectedPlugin: PluginApiObject | null = null;

queryParams: URLSearchParams | null = null;

constructor(public dialogRef: MatDialogRef<ChoosePluginComponent>, @Inject(MAT_DIALOG_DATA) public data: PluginRestrictions, private registry: PluginRegistryBaseService) {
constructor(public dialogRef: MatDialogRef<ChoosePluginDialog>, @Inject(MAT_DIALOG_DATA) public data: PluginRestrictions, private registry: PluginRegistryBaseService) {
const query = new URLSearchParams();
if (data.pluginTags) {
const tag_list = data.pluginTags.join(",");
Expand Down
23 changes: 0 additions & 23 deletions src/app/dialogs/choose-template/choose-template.dialog.spec.ts

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { MatDialogRef } from '@angular/material/dialog';

@Component({
selector: 'qhana-create-experiment',
templateUrl: './create-experiment.component.html',
styleUrls: ['./create-experiment.component.sass']
templateUrl: './create-experiment.dialog.html',
styleUrls: ['./create-experiment.dialog.sass']
})
export class CreateExperimentDialog implements OnInit {

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ interface SelectValue {

@Component({
selector: 'qhana-export-experiment',
templateUrl: './export-experiment.component.html',
styleUrls: ['./export-experiment.component.sass']
templateUrl: './export-experiment.dialog.html',
styleUrls: ['./export-experiment.dialog.sass']
})
export class ExportExperimentDialog implements OnInit {

Expand Down
25 changes: 0 additions & 25 deletions src/app/dialogs/markdown-help/markdown-help.component.spec.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { MatDialogRef } from '@angular/material/dialog';

@Component({
selector: 'qhana-markdown-help',
templateUrl: './markdown-help.component.html',
styleUrls: ['./markdown-help.component.sass']
templateUrl: './markdown-help.dialog.html',
styleUrls: ['./markdown-help.dialog.sass']
})
export class MarkdownHelpDialog {

Expand Down

0 comments on commit a7b8123

Please sign in to comment.