Skip to content

Commit

Permalink
Repository and remote renames
Browse files Browse the repository at this point in the history
RepositoryForm -> ContainerRepositoryForm

DeleteRemoteModal
  • Loading branch information
himdel committed Nov 17, 2024
1 parent b8c0d5b commit b174047
Show file tree
Hide file tree
Showing 28 changed files with 898 additions and 910 deletions.
4 changes: 2 additions & 2 deletions src/actions/ansible-remote-delete.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { msg, t } from '@lingui/macro';
import React from 'react';
import { AnsibleRemoteAPI } from 'src/api';
import { DeleteAnsibleRemoteModal } from 'src/components';
import { DeleteRemoteModal } from 'src/components';
import {
handleHttpError,
parsePulpIDFromURL,
Expand All @@ -14,7 +14,7 @@ export const ansibleRemoteDeleteAction = Action({
title: msg`Delete`,
modal: ({ addAlert, listQuery, setState, state }) =>
state.deleteModalOpen ? (
<DeleteAnsibleRemoteModal
<DeleteRemoteModal
closeAction={() => setState({ deleteModalOpen: null })}
deleteAction={() =>
deleteRemote(state.deleteModalOpen, { addAlert, setState, listQuery })
Expand Down
16 changes: 0 additions & 16 deletions src/actions/ansible-repository-delete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,6 @@ export const ansibleRepositoryDeleteAction = Action({
pulp_href,
},
}),
disabled: ({ name }) => {
if (
[
'certified',
'community',
'published',
'rejected',
'staging',
'validated',
].includes(name)
) {
return t`Protected repositories cannot be deleted.`;
}

return null;
},
});

async function deleteRepository(
Expand Down
35 changes: 34 additions & 1 deletion src/api/ansible-remote.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,38 @@
import { PulpAPI } from './pulp';
import { type AnsibleRemoteType } from './response-types/ansible-remote';

export class AnsibleRemoteType {
auth_url: string;
ca_cert: string;
client_cert: string;
download_concurrency: number;
name: string;
proxy_url: string;
pulp_href?: string;
rate_limit: number;
requirements_file: string;
tls_validation: boolean;
url: string;
signed_only: boolean;
sync_dependencies?: boolean;

// connect_timeout
// headers
// max_retries
// policy
// pulp_created
// pulp_labels
// pulp_last_updated
// sock_connect_timeout
// sock_read_timeout
// total_timeout

hidden_fields: {
is_set: boolean;
name: string;
}[];

my_permissions?: string[];
}

// simplified version of smartUpdate from execution-environment-registry
function smartUpdate(
Expand Down
20 changes: 20 additions & 0 deletions src/api/ansible-repository.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
import { PulpAPI } from './pulp';
import { type LastSyncType } from './response-types/remote';

export class AnsibleRepositoryType {
description: string;
last_sync_task?: LastSyncType;
latest_version_href?: string;
name: string;
private?: boolean;
pulp_created?: string;
pulp_href?: string;
pulp_labels?: Record<string, string>;
remote?: string;
retain_repo_versions: number;

// gpgkey
// last_synced_metadata_time
// versions_href

my_permissions?: string[];
}

const base = new PulpAPI();

Expand Down
9 changes: 5 additions & 4 deletions src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
export { ActivitiesAPI } from './activities';
export { AnsibleDistributionAPI } from './ansible-distribution';
export { AnsibleRemoteAPI } from './ansible-remote';
export { AnsibleRepositoryAPI } from './ansible-repository';
export { AnsibleRemoteAPI, type AnsibleRemoteType } from './ansible-remote';
export {
AnsibleRepositoryAPI,
type AnsibleRepositoryType,
} from './ansible-repository';
export { CertificateUploadAPI } from './certificate-upload';
export { CollectionAPI } from './collection';
export { CollectionVersionAPI } from './collection-version';
Expand Down Expand Up @@ -37,8 +40,6 @@ export { OrphanCleanupAPI } from './orphan-cleanup';
export { PulpLoginAPI } from './pulp-login';
export { PulpStatusAPI } from './pulp-status';
export { RepairAPI } from './repair';
export { type AnsibleRemoteType } from './response-types/ansible-remote';
export { type AnsibleRepositoryType } from './response-types/ansible-repository';
export {
type CollectionDetailType,
type CollectionUploadType,
Expand Down
33 changes: 0 additions & 33 deletions src/api/response-types/ansible-remote.ts

This file was deleted.

20 changes: 0 additions & 20 deletions src/api/response-types/ansible-repository.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/app-routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ const routes: IRouteConfig[] = [
component: LoginPage,
path: Paths.meta.login,
noAuth: true,
beta: true,
},
{
component: CollectionDocs,
Expand Down Expand Up @@ -275,7 +274,6 @@ const routes: IRouteConfig[] = [
component: PulpStatus,
path: Paths.core.status,
noAuth: true,
beta: true,
},
{
component: MultiSearch,
Expand Down
Loading

0 comments on commit b174047

Please sign in to comment.