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.

Sign up for GitHub

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

Jump to bottom

List, Create and Delete Gitconfigs #381

Closed
wants to merge 1 commit into from
Closed

List, Create and Delete Gitconfigs #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 60 additions & 1 deletion dashboard/pkg/epinio/config/epinio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
AGE, NAME, RAM, SIMPLE_NAME, STATE
} from '@shell/config/table-headers';
import { createEpinioRoute, rootEpinioRoute } from '../utils/custom-routing';
import { EPINIO_PRODUCT_NAME, EPINIO_STANDALONE_CLUSTER_NAME, EPINIO_TYPES } from '../types';
import { EpinioGitConfig, EPINIO_PRODUCT_NAME, EPINIO_STANDALONE_CLUSTER_NAME, EPINIO_TYPES } from '../types';
import EpinioDiscovery from '../utils/epinio-discovery';
import { MULTI_CLUSTER } from '@shell/store/features';

Expand Down Expand Up @@ -150,6 +150,16 @@ export function init($plugin: any, store: any) {
showListMasthead: false // Disable default masthead because we provide a custom one.
});

// Catalog Service
configureType(EPINIO_TYPES.GIT_CONFIG, {
isCreatable: true,
isEditable: false,
isRemovable: true,
showState: false,
canYaml: false,
customRoute: createEpinioRoute('c-cluster-resource', { resource: EPINIO_TYPES.GIT_CONFIG }),
});

virtualType({
label: store.getters['i18n/t']('epinio.intro.about'),
icon: 'dashboard',
Expand Down Expand Up @@ -188,6 +198,7 @@ export function init($plugin: any, store: any) {
EPINIO_TYPES.DASHBOARD,
EPINIO_TYPES.APP,
EPINIO_TYPES.NAMESPACE,
EPINIO_TYPES.GIT_CONFIG,
SERVICE_GROUP,
ADVANCED_GROUP,
ABOUT
Expand Down Expand Up @@ -408,4 +419,52 @@ export function init($plugin: any, store: any) {
},
AGE
]);

headers(EPINIO_TYPES.GIT_CONFIG, [
NAME,
{
name: 'provider',
labelKey: 'epinio.gitconfigs.tableHeaders.provider.label',
tooltip: 'epinio.gitconfigs.tableHeaders.provider.tooltip',
value: 'provider',
sort: ['provider'],
},
{
name: 'url',
labelKey: 'epinio.gitconfigs.tableHeaders.url.label',
tooltip: 'epinio.gitconfigs.tableHeaders.url.tooltip',
value: 'url',
sort: ['url'],
},
{
name: 'userorg',
labelKey: 'epinio.gitconfigs.tableHeaders.userorg.label',
tooltip: 'epinio.gitconfigs.tableHeaders.userorg.tooltip',
value: 'userorg',
sort: ['userorg'],
},
{
name: 'repository',
labelKey: 'epinio.gitconfigs.tableHeaders.repository.label',
tooltip: 'epinio.gitconfigs.tableHeaders.repository.tooltip',
value: 'repository',
sort: ['repository'],
},
{
name: 'skipssl',
labelKey: 'epinio.gitconfigs.tableHeaders.skipssl.label',
tooltip: 'epinio.gitconfigs.tableHeaders.skipssl.tooltip',
getValue: (row: EpinioGitConfig) => !!row.skipssl,
sort: ['skipssl'],
formatter: 'Checked' // TODO: RC test
},
{
name: 'username',
labelKey: 'epinio.gitconfigs.tableHeaders.username.label',
tooltip: 'epinio.gitconfigs.tableHeaders.username.tooltip',
value: 'username',
sort: ['username'],
},
AGE
]);
}
264 changes: 264 additions & 0 deletions dashboard/pkg/epinio/edit/gitconfigs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
<script lang="ts">
import Vue, { PropType } from 'vue';
import CreateEditView from '@shell/mixins/create-edit-view';
import Loading from '@shell/components/Loading.vue';
import CruResource from '@shell/components/CruResource.vue';
import NameNsDescription from '@shell/components/form/NameNsDescription.vue';
import { mapGetters } from 'vuex';
import { EpinioCompRecord, EpinioGitConfig } from '../types';
import { epinioExceptionToErrorsArray } from '../utils/errors';
import { validateKubernetesName } from '@shell/utils/validators/kubernetes-name';
import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
import { LabeledInput } from '@components/Form/LabeledInput';
import { _CREATE } from '@shell/config/query-params';
import { Checkbox } from '@components/Form/Checkbox';

interface Data {
}

// https://github.com/epinio/epinio/blob/a3c16e3e085652db7eef8f4bc51e88d1cfdfe265/internal/cli/cmd/gitconfigs.go#L113C1-L113C1
const GIT_CONFIG_PROVIDERS = {
GIT: 'git',
GITHUB: 'github',
GITHUB_ENTERPRISE: 'github_enterprise',
GITLAB: 'gitlab',
GITLAB_ENTERPRISE: 'gitlab_enterprise'
};

export default Vue.extend<Data, EpinioCompRecord, EpinioCompRecord, EpinioCompRecord>({
components: {
Loading,
CruResource,
NameNsDescription,
Checkbox,
LabeledSelect,
LabeledInput
},

mixins: [CreateEditView],

props: {
mode: {
type: String,
required: true
},
value: {
type: Object as PropType<EpinioGitConfig>,
required: true
},
initialValue: {
type: Object as PropType<EpinioGitConfig>,
required: true
}
},

async fetch() {
if (this.mode === _CREATE) {
this.value.provider = GIT_CONFIG_PROVIDERS.GIT;
}
},

data() {
return {
errors: [],
validationPassed: false,
};
},

computed: {
...mapGetters({ t: 'i18n/t' }),

providers() {
return Object.entries(GIT_CONFIG_PROVIDERS).map(([pKey, pValue]) => ({
label: this.t(`epinio.gitconfigs.providers.${ pKey }`),
value: pValue
}));
},

urlDisabled() {
return this.value.provider === GIT_CONFIG_PROVIDERS.GITHUB || this.value.provider === GIT_CONFIG_PROVIDERS.GITLAB;
}

},

methods: {
async save(saveCb: (success: boolean) => void) {
this.errors = [];
try {
if (this.isCreate) {
await this.value.create();
await this.$store.dispatch('epinio/findAll', { type: this.value.type, opt: { force: true } });
}

if (this.isEdit) {
await this.value.update();
await this.value.forceFetch();
}

saveCb(true);
this.done();
} catch (err) {
this.errors = epinioExceptionToErrorsArray(err);
saveCb(false);
}
},

updateValidation() {
const nameErrors = validateKubernetesName(this.value?.meta.name || '', this.t('epinio.namespace.name'), this.$store.getters, undefined, []);

Vue.set(this, 'validationPassed', nameErrors.length === 0 && !!this.value.provider && !!this.value.url);
}

},

watch: {
'value.provider'(neu, old) {
if (neu === GIT_CONFIG_PROVIDERS.GITHUB) {
Vue.set(this.value, 'url', `https://github.com`);
Vue.set(this.value, 'skipsll', false);
} else if (neu === GIT_CONFIG_PROVIDERS.GITLAB) {
Vue.set(this.value, 'url', `https://gitlab.com`); // TODO: RC
Vue.set(this.value, 'skipsll', false);
} else if (old === GIT_CONFIG_PROVIDERS.GITHUB || old === GIT_CONFIG_PROVIDERS.GITLAB) {
Vue.set(this.value, 'url', '');
}
},

'value.meta.name'() {
this.updateValidation();
},

'value.url'() {
this.updateValidation();
},
}
});
</script>

<template>
<Loading v-if="!value || $fetchState.pending" />
<CruResource
v-else-if="value"
:min-height="'7em'"
:mode="mode"
:done-route="doneRoute"
:resource="value"
:can-yaml="false"
:errors="errors"
:validation-passed="validationPassed"
namespace-key="meta.namespace"
@error="(e) => (errors = e)"
@finish="save"
@cancel="done"
>
<!-- {{ JSON.stringify(value) }}<br> -->

<NameNsDescription
name-key="name"
:namespaced="false"
:description-hidden="true"
:value="value.meta"
:mode="mode"
/>
<h3 class="mt-20">
{{ t('epinio.gitconfigs.sections.git') }}
</h3>
<div class="row">
<div class="col span-2">
<!-- Provider -->
<LabeledSelect
v-model="value.provider"
:options="providers"
:searchable="true"
:mode="mode"
:required="true"
:label-key="'epinio.gitconfigs.tableHeaders.provider.label'"
:tooltip="t('epinio.gitconfigs.tableHeaders.provider.tooltip')"
/>
</div>
<div class="col span-4">
<!-- URL -->
<LabeledInput
v-model="value.url"
:disabled="urlDisabled"
:label-key="'epinio.gitconfigs.tableHeaders.url.label'"
:tooltip="t('epinio.gitconfigs.tableHeaders.url.tooltip')"
:mode="mode"
:required="true"
/>
<!-- :rules="rules.name" -- TODO: RC> -->
</div>
<div class="col span-1">
<!-- skipssl -->
<Checkbox
v-model="value.skipssl"
:disabled="urlDisabled"
:label-key="'epinio.gitconfigs.tableHeaders.skipssl.label'"
:tooltip="t('epinio.gitconfigs.tableHeaders.skipssl.tooltip')"
:mode="mode"
/>
<!-- :rules="rules.name" -- TODO: RC> -->
</div>
</div>
<div class="spacer" />
<div class="row">
<div class="col span-4">
<!-- repository -->
<LabeledInput
v-model="value.repository"
:label-key="'epinio.gitconfigs.tableHeaders.repository.label'"
:tooltip="t('epinio.gitconfigs.tableHeaders.repository.tooltip')"
:mode="mode"
/>
<!-- :rules="rules.name" -- TODO: RC> -->
</div>
<div class="col span-4">
<!-- userorg -->
<LabeledInput
v-model="value.userorg"
:label-key="'epinio.gitconfigs.tableHeaders.userorg.label'"
:tooltip="t('epinio.gitconfigs.tableHeaders.userorg.tooltip')"
:mode="mode"
/>
<!-- :rules="rules.name" -- TODO: RC> -->
</div>
</div>
<div class="spacer" />
<h3>
{{ t('epinio.gitconfigs.sections.credentials') }}
</h3>
<div class="row">
<div
v-if="!isView"
class="col span-4"
>
<!-- password -->
<LabeledInput
v-model="value.password"
:label-key="'epinio.gitconfigs.password.label'"
:tooltip="t('epinio.gitconfigs.password.tooltip')"
:mode="mode"
:required="true"
/>
<!-- :rules="rules.name" -- TODO: RC> -->
</div>
<div class="col span-4">
<!-- username -->
<LabeledInput
v-model="value.username"
:label-key="'epinio.gitconfigs.tableHeaders.username.label'"
:tooltip="t('epinio.gitconfigs.tableHeaders.username.tooltip')"
:mode="mode"
/>
<!-- :rules="rules.name" -- TODO: RC> -->
</div>
</div>
</CruResource>
</template>

<style lang='scss' scoped>
.row {
display: flex;
align-items: center;
}
</style>
Loading
Loading