Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • coscine/frontend/apps/ui
1 result
Select Git revision
Loading items
Show changes
Commits on Source (3)
{
"name": "ui",
"version": "2.6.2",
"private": true,
"version": "2.6.3",
"scripts": {
"dev": "vite",
"build": "vite build",
......@@ -13,8 +12,8 @@
"coverage": "vitest run --coverage"
},
"dependencies": {
"@coscine/api-client": "3.4.0",
"@coscine/form-generator": "^3.5.7",
"@coscine/api-client": "^3.4.1",
"@coscine/form-generator": "3.5.7-dev.22",
"@dynamic-mapper/mapper": "^1.10.4",
"@pinia/testing": "^0.1.3",
"@rdfjs-elements/formats-pretty": "^0.6.4",
......
......@@ -22,10 +22,6 @@ export default {
loadingSpinnerProjectCreation:
"Die Projekterstellung kann derzeit bis zu einer Minute dauern. Vielen Dank für Ihre Geduld.",
copyOwnersToSubprojectLabel: "Owner kopieren:",
copyOwnersToSubprojectPopover:
"Alle aktuellen Owner in das neue untergeordnete Projekt kopieren? Zukünftige Änderungen werden nicht automatisch aktualisiert.",
form: "@:(form.project.form)",
},
......
......@@ -21,10 +21,6 @@ export default {
"As a member of RWTH Aachen your project will be provided with 25 GB quota for RDS-Web storage.",
loadingSpinnerProjectCreation:
"Creating projects currently takes up to a minute. Thank you for your patience.",
copyOwnersToSubprojectLabel: "Copy Owners:",
copyOwnersToSubprojectPopover:
"Copy all current owners to the new sub-project? Future changes will not be automatically updated.",
},
// Members.vue
......
......@@ -30,26 +30,6 @@
@validation="formValidations.metadata = $event"
/><!-- TODO: Fix @validation assignment and typing -->
<!-- Copy owner checkbox/switch-->
<CoscineFormGroup
v-if="project"
:label="$t('page.createProject.copyOwnersToSubprojectLabel')"
label-for="CopyOwnerCheckbox"
type="input"
info
>
<template #popover>
{{ $t("page.createProject.copyOwnersToSubprojectPopover") }}
</template>
<b-form-checkbox
id="CopyOwnerCheckbox"
v-model="projectForCreation.copyOwnersFromParent"
switch
>
</b-form-checkbox>
</CoscineFormGroup>
<b-form-group>
<!-- Submit Button -->
<b-button
......@@ -129,8 +109,6 @@ export default defineComponent({
disciplines: [],
organizations: [],
visibility: {} as VisibilityForProjectManipulationDto,
parentId: undefined,
copyOwnersFromParent: undefined,
} as ProjectForCreationDto,
formValidations: {
......
......@@ -14,7 +14,7 @@
:title="$t('page.project.addResource')"
type="create"
:to="toCreateResource()"
:disabled="!isEmailValid || isGuest || isMember"
:disabled="!isEmailValid || isGuest"
@open-card="openCreateResource($event)"
/>
<b-tooltip target="addResource">
......@@ -70,7 +70,7 @@
:title="$t('page.listProjects.addProject')"
type="create"
:to="toCreateSubProject()"
:disabled="isGuest || isMember"
:disabled="isGuest"
@open-card="openCreateProject($event)"
/>
<!-- Loading Card Placeholder -->
......@@ -146,9 +146,6 @@ export default defineComponent({
isGuest(): boolean | undefined {
return this.projectStore.currentUserRoleIsGuest;
},
isMember(): boolean | undefined {
return this.projectStore.currentUserRoleIsMember;
},
isLoadingRoles(): boolean {
return this.projectStore.currentUserRole ? false : true;
},
......@@ -191,15 +188,15 @@ export default defineComponent({
name: "resource-settings",
params: { guid: resource.id, slug: this.project?.slug },
} as RawLocation;
return this.isGuest || this.isMember ? null : route;
return this.isGuest ? null : route;
},
openCreateProject(to: RawLocation) {
if (!(this.isGuest || this.isMember)) {
if (!this.isGuest) {
this.$router.push(to);
}
},
openCreateResource(to: RawLocation) {
if (this.isEmailValid && !(this.isGuest || this.isMember)) {
if (this.isEmailValid && !this.isGuest) {
// Set current resource ID to null
this.resourceStore.currentId = null;
this.$router.push(to);
......
......@@ -469,11 +469,9 @@ export default defineComponent({
},
onParentProjectLoaded() {
const projectForManipulation = this
.projectForManipulation as ProjectForCreationDto;
if (this.parentProject && projectForManipulation) {
projectForManipulation.parentId = this.parentProject.id;
projectForManipulation.copyOwnersFromParent = true;
if (this.parentProject) {
(this.projectForManipulation as ProjectForCreationDto).parentId =
this.parentProject.id;
}
},
......
......@@ -16,7 +16,7 @@
<!-- Resource Settings Button -->
<b-button
v-if="!(isGuest || isMember)"
v-if="!isGuest"
:title="$t('page.resource.edit')"
size="sm"
class="btn-sm mx-1"
......@@ -227,9 +227,6 @@ export default defineComponent({
isOwner(): boolean | undefined {
return this.projectStore.currentUserRoleIsOwner;
},
isMember(): boolean | undefined {
return this.projectStore.currentUserRoleIsMember;
},
isGuest(): boolean | undefined {
return this.projectStore.currentUserRoleIsGuest;
},
......@@ -272,7 +269,7 @@ export default defineComponent({
// Load Quotas for the project if not present - needed for the quota progress bar
if (
this.projectStore.currentResourceTypesQuotas === null &&
!(this.isGuest || this.isMember)
!this.isGuest
) {
await this.projectStore.retrieveResourceTypeQuotas(this.project);
}
......
......@@ -262,9 +262,6 @@ export default defineComponent({
isGuest(): boolean | undefined {
return this.projectStore.currentUserRoleIsGuest;
},
isMember(): boolean | undefined {
return this.projectStore.currentUserRoleIsMember;
},
applicationProfile(): Dataset | null {
return this.resourceStore.currentFullApplicationProfile;
},
......
......@@ -219,7 +219,7 @@ export default defineComponent({
title: this.$t("form.steps.first").toString(),
active: true,
step: "configuration",
hidden: (this.isGuest || this.isMember) ?? false,
hidden: this.isGuest ?? false,
},
{
title: this.$t("form.steps.second").toString(),
......@@ -252,9 +252,6 @@ export default defineComponent({
isOwner(): boolean | undefined {
return this.projectStore.currentUserRoleIsOwner;
},
isMember(): boolean | undefined {
return this.projectStore.currentUserRoleIsMember;
},
isGuest(): boolean | undefined {
return this.projectStore.currentUserRoleIsGuest;
},
......@@ -272,8 +269,7 @@ export default defineComponent({
// Convoluted logic that prohibits a Guest&Creator edits, but allows Member&Creator edits. Setting it like so for the time being to manage the deadline.
// TODO: Proper Roles Matrix
if (
(this.isOwner ||
(this.isResourceCreator && !(this.isGuest || this.isMember))) &&
(this.isOwner || (this.isResourceCreator && !this.isGuest)) &&
this.resourceForUpdate
) {
return true;
......
......@@ -436,18 +436,18 @@ __metadata:
languageName: node
linkType: hard
"@coscine/api-client@npm:3.4.0":
version: 3.4.0
resolution: "@coscine/api-client@npm:3.4.0"
"@coscine/api-client@npm:^3.4.1":
version: 3.4.1
resolution: "@coscine/api-client@npm:3.4.1::__archiveUrl=https%3A%2F%2Fgit.rwth-aachen.de%2Fapi%2Fv4%2Fprojects%2F61847%2Fpackages%2Fnpm%2F%40coscine%2Fapi-client%2F-%2F%40coscine%2Fapi-client-3.4.1.tgz"
dependencies:
axios: "npm:^1.6.2"
checksum: 1104a9c0ac9da3254f46b69f4d1312533adb18a589a40e9bc440065c2fc36078dbba536882cd058f89482aa28f1b4d2599a8ecdaf7f756f3fba60413ed7f8726
checksum: c96ccc2ec3dd48b44312cba6734d02747bdca205f794941184f89a318b1a667cbe263b47a426e006e6120f83597110d82694c5fd8a3f4fc276b1f15690d5daf9
languageName: node
linkType: hard
"@coscine/form-generator@npm:^3.5.7":
version: 3.5.7
resolution: "@coscine/form-generator@npm:3.5.7"
"@coscine/form-generator@npm:3.5.7-dev.22":
version: 3.5.7-dev.22
resolution: "@coscine/form-generator@npm:3.5.7-dev.22::__archiveUrl=https%3A%2F%2Fgit.rwth-aachen.de%2Fapi%2Fv4%2Fprojects%2F35944%2Fpackages%2Fnpm%2F%40coscine%2Fform-generator%2F-%2F%40coscine%2Fform-generator-3.5.7-dev.22.tgz"
dependencies:
"@zazuko/prefixes": "npm:^2.1.0"
bootstrap: "npm:4.6.1"
......@@ -460,13 +460,11 @@ __metadata:
vue-i18n: "npm:^8.28.2"
vue-material-design-icons: "npm:^5.2.0"
vue-multiselect: "npm:^2.1.8"
vue-observe-visibility: "npm:^1.0.0"
peerDependencies:
"@vue/composition-api": ^1.0.0-rc.1
vue: ^2.0.0
peerDependenciesMeta:
"@vue/composition-api":
optional: true
checksum: 7eb666e0d2c07faff86b50e068fcd6b1e68065729e2c5f6914cec99956871a9414227eac63dfd2713b382f51d7925deb4dbd83fde28af68982ab26a4bb9fa942
checksum: cd72e71dc60b2894d4592768261292bfd9fe2a11badeeacb0c6069f08b049e78388e19c45ea41cdd56256bce7e12c54e284a01be968f7a1fef76d55830f318b9
languageName: node
linkType: hard
......@@ -13158,8 +13156,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "ui@workspace:."
dependencies:
"@coscine/api-client": "npm:3.4.0"
"@coscine/form-generator": "npm:^3.5.7"
"@coscine/api-client": "npm:^3.4.1"
"@coscine/form-generator": "npm:3.5.7-dev.22"
"@dynamic-mapper/mapper": "npm:^1.10.4"
"@pinia/testing": "npm:^0.1.3"
"@rdfjs-elements/formats-pretty": "npm:^0.6.4"
......@@ -13975,6 +13973,13 @@ __metadata:
languageName: node
linkType: hard
"vue-observe-visibility@npm:^1.0.0":
version: 1.0.0
resolution: "vue-observe-visibility@npm:1.0.0"
checksum: 46b2e6415d53e42ed53875622f241458af3d8493d31acfcc41d0f53a26f8aaa37378fa49ff3ebdcc5438dbac6d6b77c578d234ca7431917f8a1629fb06c2dfb5
languageName: node
linkType: hard
"vue-router@npm:^3.6.5":
version: 3.6.5
resolution: "vue-router@npm:3.6.5"
......