mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2024-11-27 06:01:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependency adding

Browse Source 
Doesn't look perfect, especially the edit modal needs to be made larger, but slightly better and works now™️
This commit is contained in:
Nassim Jahnke 2022-07-01 18:59:32 +02:00
parent 87f0725385
commit af3097570a
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
2 changed files with 62 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
frontend/src/components/projects/DependencyTable.vue
View File

@ -11,6 +11,7 @@ import { computed, ref } from "vue";
import InputAutocomplete from "~/lib/components/ui/InputAutocomplete.vue";
import { useApi } from "~/composables/useApi";
import { useRoute } from "vue-router";
import Tabs, { Tab } from "~/lib/components/design/Tabs.vue";
const route = useRoute();
const i18n = useI18n();
@ -112,6 +113,12 @@ function fromString(string: string): ProjectNamespace | string | null {
};
}
const selectedUploadTab = ref("file");
const selectedUploadTabs: Tab[] = [
{ value: "file", header: "Hangar" },
{ value: "url", header: "URL" },
];
defineExpose({ results, newDepResults, newDeps, deletedDeps, reset: reset });
</script>
@ -131,30 +138,36 @@ defineExpose({ results, newDepResults, newDeps, deletedDeps, reset: reset });
<template v-if="!isNew">
<tr v-for="(dep, index) in filteredDeps" :key="`${platform}-${dep.name}`">
<td>{{ dep.name }}</td>
<td><InputCheckbox v-model="dep.required" /></td>
<td><InputCheckbox v-model="dep.required" />asdas</td>
<td class="flex flex-wrap gap-2">
<InputText
v-model.trim="dep.externalUrl"
:placeholder="t('version.new.form.externalUrl')"
:disabled="dep.namespace !== null && Object.keys(dep.namespace).length !== 0"
clearable
@change="dep.namespace = null"
/>
<Tabs v-model="selectedUploadTab" :tabs="selectedUploadTabs" class="items-center" compact>
<template #file>
<InputAutocomplete
:id="dep.name"
:model-value="toString(dep.namespace)"
:placeholder="t('version.new.form.hangarProject')"
:values="results[dep.name]"
:item-text="getNamespace"
:item-value="getNamespace"
:disabled="!!dep.externalUrl"
@search="onSearch($event, dep.name)"
@change="dep.externalUrl = null"
@update:model-value="dep.namespace = fromString($event)"
/>
</template>
<template #url>
<InputText
v-model.trim="dep.externalUrl"
:placeholder="t('version.new.form.externalUrl')"
:disabled="dep.namespace !== null && Object.keys(dep.namespace).length !== 0"
clearable
@change="dep.namespace = null"
/>
</template>
</Tabs>
<!-- :rules="dep.namespace !== null && Object.keys(dep.namespace).length !== 0 ? [] : [required(t('version.new.form.externalUrl'))]" -->
<!-- todo fix validation of dependency table -->
<!-- :rules="!!dep.externalUrl ? [] : [required(t('version.new.form.hangarProject'))]" -->
<InputAutocomplete
:id="dep.name"
:model-value="toString(dep.namespace)"
:placeholder="t('version.new.form.hangarProject')"
:values="results[dep.name]"
:item-text="getNamespace"
:item-value="getNamespace"
:disabled="!!dep.externalUrl"
@search="onSearch($event, dep.name)"
@change="dep.externalUrl = null"
@update:modelValue="dep.namespace = fromString($event)"
/>
</td>
<td v-if="!noEditing">
<Button icon color="error" @click="deleteDep(index)">
@ -178,28 +191,34 @@ defineExpose({ results, newDepResults, newDeps, deletedDeps, reset: reset });
/>
</td>
<td><InputCheckbox v-model="newDep.required" :ripple="false" /></td>
<td class="flex flex-wrap gap-2">
<InputText
v-model.trim="newDep.externalUrl"
:placeholder="t('version.new.form.externalUrl')"
:disabled="newDep.namespace !== null && Object.keys(newDep.namespace).length !== 0"
:rules="newDep.namespace !== null && Object.keys(newDep.namespace).length !== 0 ? [] : [required(t('version.new.form.externalUrl'))]"
clearable
@change="newDep.namespace = null"
/>
<InputAutocomplete
:id="newDep.name"
:model-value="toString(newDep.namespace)"
:placeholder="t('version.new.form.hangarProject')"
:values="newDepResults[index]"
:item-text="getNamespace"
:item-value="getNamespace"
:disabled="!!newDep.externalUrl"
:rules="!!newDep.externalUrl ? [] : [required(t('version.new.form.hangarProject'))]"
@search="onNewDepSearch($event, index)"
@change="newDep.externalUrl = null"
@update:modelValue="newDep.namespace = fromString($event)"
/>
<td class="flex flex-wrap gap-2 items-center">
<Tabs v-model="selectedUploadTab" :tabs="selectedUploadTabs" class="items-center" compact>
<template #file>
<InputAutocomplete
:id="newDep.name"
:model-value="toString(newDep.namespace)"
:placeholder="t('version.new.form.hangarProject')"
:values="newDepResults[index]"
:item-text="getNamespace"
:item-value="getNamespace"
:disabled="!!newDep.externalUrl"
:rules="!!newDep.externalUrl ? [] : [required(t('version.new.form.hangarProject'))]"
@search="onNewDepSearch($event, index)"
@change="newDep.externalUrl = null"
@update:modelValue="newDep.namespace = fromString($event)"
/>
</template>
<template #url>
<InputText
v-model.trim="newDep.externalUrl"
:placeholder="t('version.new.form.externalUrl')"
:disabled="newDep.namespace !== null && Object.keys(newDep.namespace).length !== 0"
:rules="newDep.namespace !== null && Object.keys(newDep.namespace).length !== 0 ? [] : [required(t('version.new.form.externalUrl'))]"
clearable
@change="newDep.namespace = null"
/>
</template>
</Tabs>
</td>
<td v-if="!noEditing">
<Button button-type="red" @click="deleteNewDep(index)">

2
frontend/src/lib

@ -1 +1 @@
Subproject commit 2de140fce8e43d38f5434d7551095d8051ae5aa4
Subproject commit 8810e010546040acfa83df7f33ead441267da875