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

chore: Rename GitSettings to GitInstances #2116

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions frontend/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { SessionViewerComponent } from 'src/app/sessions/session/session-viewer.
import { ConfigurationSettingsComponent } from 'src/app/settings/core/configuration-settings/configuration-settings.component';
import { PipelinesOverviewComponent } from 'src/app/settings/core/pipelines-overview/pipelines-overview.component';
import { CreateToolComponent } from 'src/app/settings/core/tools-settings/create-tool/create-tool.component';
import { AddGitInstanceComponent } from 'src/app/settings/modelsources/git-settings/add-git-instance/add-git-instance.component';
import { AddGitInstanceComponent } from 'src/app/settings/modelsources/git-instances/add-git-instance/add-git-instance.component';
import { BasicAuthTokenComponent } from 'src/app/users/basic-auth-token/basic-auth-token.component';
import { UserWrapperComponent } from 'src/app/users/user-wrapper/user-wrapper.component';
import { UsersProfileComponent } from 'src/app/users/users-profile/users-profile.component';
Expand All @@ -42,8 +42,8 @@ import { AlertSettingsComponent } from './settings/core/alert-settings/alert-set
import { ToolDetailsComponent } from './settings/core/tools-settings/tool-details/tool-details.component';
import { ToolsSettingsComponent } from './settings/core/tools-settings/tools-settings.component';
import { PureVariantsComponent } from './settings/integrations/pure-variants/pure-variants.component';
import { EditGitSettingsComponent } from './settings/modelsources/git-settings/edit-git-settings/edit-git-settings.component';
import { GitSettingsComponent } from './settings/modelsources/git-settings/git-settings.component';
import { EditGitInstanceComponent } from './settings/modelsources/git-instances/edit-git-instance/edit-git-instance.component';
import { GitInstancesComponent } from './settings/modelsources/git-instances/git-instances.component';
import { EditT4CInstanceComponent } from './settings/modelsources/t4c-settings/edit-t4c-instance/edit-t4c-instance.component';
import { EditT4cLicenseServerComponent } from './settings/modelsources/t4c-settings/edit-t4c-license-server/edit-t4c-license-server.component';
import { T4CSettingsWrapperComponent } from './settings/modelsources/t4c-settings/t4c-settings-wrapper/t4c-settings-wrapper.component';
Expand Down Expand Up @@ -419,7 +419,7 @@ export const routes: Routes = [
{
path: '',
data: { breadcrumb: undefined },
children: [{ path: '', component: GitSettingsComponent }],
children: [{ path: '', component: GitInstancesComponent }],
},
{
path: 'create',
Expand All @@ -440,7 +440,7 @@ export const routes: Routes = [
data: {
breadcrumb: (data: Data) => data.gitInstance?.name,
},
component: EditGitSettingsComponent,
component: EditGitInstanceComponent,
},
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import { ModelWrapperService } from 'src/app/projects/models/service/model.servi
import { GitModelService } from 'src/app/projects/project-detail/model-overview/model-detail/git-model.service';
import { ProjectWrapperService } from 'src/app/projects/service/project.service';
import { GitService } from 'src/app/services/git/git.service';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-settings/service/git-instances.service';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-instances/service/git-instances.service';

@UntilDestroy()
@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { ToastService } from 'src/app/helpers/toast/toast.service';
import { absoluteUrlValidator } from 'src/app/helpers/validators/url-validator';
import { PostGitInstance } from 'src/app/openapi';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-settings/service/git-instances.service';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-instances/service/git-instances.service';

@Component({
selector: 'app-add-git-instance',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import { BreadcrumbsService } from 'src/app/general/breadcrumbs/breadcrumbs.serv
import { ConfirmationDialogComponent } from 'src/app/helpers/confirmation-dialog/confirmation-dialog.component';
import { ToastService } from 'src/app/helpers/toast/toast.service';
import { GitInstance, PostGitInstance } from 'src/app/openapi';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-settings/service/git-instances.service';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-instances/service/git-instances.service';

@UntilDestroy()
@Component({
selector: 'app-edit-git-settings',
templateUrl: './edit-git-settings.component.html',
selector: 'app-edit-git-instance',
templateUrl: './edit-git-instance.component.html',
imports: [
FormsModule,
ReactiveFormsModule,
Expand All @@ -42,7 +42,7 @@ import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-se
MatIconModule,
],
})
export class EditGitSettingsComponent implements OnInit, OnDestroy {
export class EditGitInstanceComponent implements OnInit, OnDestroy {
gitInstanceForm = this.fb.group({
type: ['', Validators.required],
name: ['', Validators.required],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import {
mockGitInstance,
mockGitInstancesServiceProvider,
} from 'src/storybook/git';
import { EditGitSettingsComponent } from './edit-git-settings.component';
import { EditGitInstanceComponent } from './edit-git-instance.component';

const meta: Meta<EditGitSettingsComponent> = {
const meta: Meta<EditGitInstanceComponent> = {
title: 'Settings Components/Modelsources/Git/Edit Instance',
component: EditGitSettingsComponent,
component: EditGitInstanceComponent,
};

export default meta;
type Story = StoryObj<EditGitSettingsComponent>;
type Story = StoryObj<EditGitInstanceComponent>;

export const General: Story = {
args: {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import { RouterLink } from '@angular/router';
import { UntilDestroy } from '@ngneat/until-destroy';
import { MatIconComponent } from 'src/app/helpers/mat-icon/mat-icon.component';
import { MatCardOverviewSkeletonLoaderComponent } from 'src/app/helpers/skeleton-loaders/mat-card-overview-skeleton-loader/mat-card-overview-skeleton-loader.component';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-settings/service/git-instances.service';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-instances/service/git-instances.service';

@UntilDestroy()
@Component({
selector: 'app-git-settings',
templateUrl: './git-settings.component.html',
selector: 'app-git-instances',
templateUrl: './git-instances.component.html',
imports: [
RouterLink,
FormsModule,
Expand All @@ -24,7 +24,7 @@ import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-se
MatCardOverviewSkeletonLoaderComponent,
],
})
export class GitSettingsComponent implements OnInit {
export class GitInstancesComponent implements OnInit {
constructor(public gitInstancesService: GitInstancesWrapperService) {}

ngOnInit(): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import {
mockGitInstancesServiceProvider,
mockGitLabInstance,
} from 'src/storybook/git';
import { GitSettingsComponent } from './git-settings.component';
import { GitInstancesComponent } from './git-instances.component';

const meta: Meta<GitSettingsComponent> = {
const meta: Meta<GitInstancesComponent> = {
title: 'Settings Components/Modelsources/Git/Instances',
component: GitSettingsComponent,
component: GitInstancesComponent,
};

export default meta;
type Story = StoryObj<GitSettingsComponent>;
type Story = StoryObj<GitInstancesComponent>;

export const Loading: Story = {
args: {},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/storybook/git.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
ValidationError,
} from 'src/app/openapi';
import { GitModelService } from 'src/app/projects/project-detail/model-overview/model-detail/git-model.service';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-settings/service/git-instances.service';
import { GitInstancesWrapperService } from 'src/app/settings/modelsources/git-instances/service/git-instances.service';

export const mockPrimaryGitModel: Readonly<GitModel> = {
id: 1,
Expand Down
Loading