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
  • 2.11.0-privacyPolicy
  • APIv2
  • Docs/Setup
  • Experiment/fix-debugging
  • Experimental/Heinrichs-cypress
  • Feature/xxxx-turnOffDataPub
  • Fix/xxxx-ToS400Error
  • Fix/xxxx-migrateLogin
  • Fix/xxxx-tokenUploadButton
  • Hotfix/0038-correctDownload
  • Hotfix/1917-PublicFilesVisibility
  • Hotfix/1963-fixOrganizationField
  • Hotfix/2015-PublicFilesVisibility
  • Hotfix/2130-uiv2ContactChange
  • Hotfix/2144-invitationCall
  • Hotfix/2150-fixUpload
  • Hotfix/2160-userOrgsInst
  • Hotfix/2190-requiredFieldsForUserProfile
  • Hotfix/2196-RCVTableTranslation
  • Hotfix/2212-fixFiles
  • Hotfix/2226-userProfileSaveButton
  • Hotfix/2232-dependencyFix
  • Hotfix/2233-fixMe
  • Hotfix/2258-saveButtonWorksAsExpected
  • Hotfix/2296-selectedValuesNotReturned
  • Hotfix/2308-defaultLicense
  • Hotfix/2335-fixingSearchRCV
  • Hotfix/2353-dropShape
  • Hotfix/2370-fixDeleteButton
  • Hotfix/2378-linkedFix
  • Hotfix/2379-filesDragAndDrop
  • Hotfix/2382-guestStillBuggy
  • Hotfix/2384-guestsAndLinked
  • Hotfix/2427-adminTrouble
  • Hotfix/2459-EncodingPath
  • Hotfix/2465-orcidLink
  • Hotfix/2465-orcidLink-v1.25.1
  • Hotfix/2504-formGen
  • Hotfix/2541-resCreate
  • Hotfix/2601-correctMetadataIdentity
  • Hotfix/2611-feedback
  • Hotfix/2618-turtle
  • Hotfix/2681-validationErrors
  • Hotfix/2684-correctEncoding
  • Hotfix/2684-fixSubMetadata
  • Hotfix/2713-validateEntryName
  • Hotfix/2734-allowEmptyLicense
  • Hotfix/2765-encodingAgain
  • Hotfix/2852-adaptTextForToSUi
  • Hotfix/2853-optimizationV4
  • Hotfix/2943-reloadingResources
  • Hotfix/2943-searchHighlighting
  • Hotfix/2957-styleAndUpgrade
  • Hotfix/2971-fixTextInDataPub
  • Hotfix/2989-cookieLength
  • Hotfix/662-keepSidebarExpanded
  • Hotfix/xxxx-correctLinking
  • Hotfix/xxxx-folderRecursive
  • Hotfix/xxxx-fullscreenCss
  • Hotfix/xxxx-homepageDisplay
  • Hotfix/xxxx-liveReleaseFixes
  • Hotfix/xxxx-partnerProjects
  • Hotfix/xxxx-workingFileIndex
  • Issue/1782-structualDataIntegration
  • Issue/1792-newMetadataStructure
  • Issue/1822-coscineUIv2App
  • Issue/1824-componentsUIv2
  • Issue/1824-routerAdditions
  • Issue/1825-codeQualityPipelines
  • Issue/1833-newLogin
  • Issue/1843-multipleFilesValidation
  • Issue/1860-searchScoping
  • Issue/1861-searchMetadata
  • Issue/1862-searchFacets
  • Issue/1863-paginationForSearch
  • Issue/1926-userProfile
  • Issue/1927-projectAppMigration
  • Issue/1928-sidebarmenuAddition
  • Issue/1929-vuexToPinia
  • Issue/1938-internalHandling
  • Issue/1951-quotaImplementation
  • Issue/1953-owlImports
  • Issue/1957-resourceAppMigration
  • Issue/1957-resourceAppMigrationNew
  • Issue/1962-SearchAppUI2
  • Issue/1964-tokenExpiryUIv2
  • Issue/1965-userListMigration
  • Issue/1970-breadcrumbs
  • Issue/1971-projectEditCreateMigration
  • Issue/1972-homeDepot
  • Issue/1974-shibbolethLogout
  • Issue/1976-resouceCreationVaildEmail
  • Issue/1979-supportAdminUIv2Migration
  • Issue/1980-userManagement
  • Issue/1985-adaptSidebar
  • Issue/2002-migrateResourceCreate
  • Issue/2003-resourceSettings
  • Issue/2008-quotaManagement
  • Issue/2011-pathConfig
  • Issue/2016-BannerMigration
  • 1.28.0-pilot
  • v1.0.0
  • v1.1.0
  • v1.10.0
  • v1.10.1
  • v1.10.2
  • v1.10.3
  • v1.11.0
  • v1.11.1
  • v1.11.2
  • v1.11.3
  • v1.11.4
  • v1.11.5
  • v1.11.6
  • v1.11.7
  • v1.12.0
  • v1.13.0
  • v1.14.0
  • v1.14.1
  • v1.14.2
  • v1.14.3
  • v1.15.0
  • v1.15.1
  • v1.16.0
  • v1.16.1
  • v1.16.2
  • v1.16.3
  • v1.17.0
  • v1.17.1
  • v1.17.2
  • v1.18.0
  • v1.18.1
  • v1.19.0
  • v1.2.0
  • v1.20.0
  • v1.20.1
  • v1.20.2
  • v1.20.3
  • v1.20.4
  • v1.20.5
  • v1.21.0
  • v1.22.0
  • v1.22.1
  • v1.22.2
  • v1.23.0
  • v1.23.1
  • v1.23.2
  • v1.23.3
  • v1.23.4
  • v1.23.5
  • v1.23.6
  • v1.23.6-patch-2417-2427
  • v1.24.0
  • v1.24.1
  • v1.25.0
  • v1.25.1
  • v1.26.0
  • v1.26.1
  • v1.27.0
  • v1.27.1
  • v1.27.1-pilot
  • v1.28.0
  • v1.29.0
  • v1.29.1
  • v1.29.2
  • v1.3.0
  • v1.30.0
  • v1.30.1
  • v1.30.2
  • v1.31.0
  • v1.32.0
  • v1.4.0
  • v1.4.1
  • v1.5.0
  • v1.6.0
  • v1.6.1
  • v1.6.2
  • v1.7.0
  • v1.8.0
  • v1.8.1
  • v1.8.2
  • v1.9.0
  • v2.0.0
  • v2.1.0
  • v2.10.0
  • v2.10.1
  • v2.11.0
  • v2.12.0
  • v2.12.1
  • v2.12.2
  • v2.12.3
  • v2.12.4
  • v2.12.5
  • v2.13.0
  • v2.13.1
  • v2.13.2
  • v2.13.3
  • v2.13.4
  • v2.14.0
  • v2.15.0
200 results

Target

Select target project
  • coscine/frontend/apps/ui
1 result
Select Git revision
  • 2.11.0-privacyPolicy
  • APIv2
  • Docs/Setup
  • Experiment/fix-debugging
  • Experimental/Heinrichs-cypress
  • Feature/xxxx-turnOffDataPub
  • Fix/xxxx-ToS400Error
  • Fix/xxxx-migrateLogin
  • Fix/xxxx-tokenUploadButton
  • Hotfix/0038-correctDownload
  • Hotfix/1917-PublicFilesVisibility
  • Hotfix/1963-fixOrganizationField
  • Hotfix/2015-PublicFilesVisibility
  • Hotfix/2130-uiv2ContactChange
  • Hotfix/2144-invitationCall
  • Hotfix/2150-fixUpload
  • Hotfix/2160-userOrgsInst
  • Hotfix/2190-requiredFieldsForUserProfile
  • Hotfix/2196-RCVTableTranslation
  • Hotfix/2212-fixFiles
  • Hotfix/2226-userProfileSaveButton
  • Hotfix/2232-dependencyFix
  • Hotfix/2233-fixMe
  • Hotfix/2258-saveButtonWorksAsExpected
  • Hotfix/2296-selectedValuesNotReturned
  • Hotfix/2308-defaultLicense
  • Hotfix/2335-fixingSearchRCV
  • Hotfix/2353-dropShape
  • Hotfix/2370-fixDeleteButton
  • Hotfix/2378-linkedFix
  • Hotfix/2379-filesDragAndDrop
  • Hotfix/2382-guestStillBuggy
  • Hotfix/2384-guestsAndLinked
  • Hotfix/2427-adminTrouble
  • Hotfix/2459-EncodingPath
  • Hotfix/2465-orcidLink
  • Hotfix/2465-orcidLink-v1.25.1
  • Hotfix/2504-formGen
  • Hotfix/2541-resCreate
  • Hotfix/2601-correctMetadataIdentity
  • Hotfix/2611-feedback
  • Hotfix/2618-turtle
  • Hotfix/2681-validationErrors
  • Hotfix/2684-correctEncoding
  • Hotfix/2684-fixSubMetadata
  • Hotfix/2713-validateEntryName
  • Hotfix/2734-allowEmptyLicense
  • Hotfix/2765-encodingAgain
  • Hotfix/2852-adaptTextForToSUi
  • Hotfix/2853-optimizationV4
  • Hotfix/2943-reloadingResources
  • Hotfix/2943-searchHighlighting
  • Hotfix/2957-styleAndUpgrade
  • Hotfix/2971-fixTextInDataPub
  • Hotfix/2989-cookieLength
  • Hotfix/662-keepSidebarExpanded
  • Hotfix/xxxx-correctLinking
  • Hotfix/xxxx-folderRecursive
  • Hotfix/xxxx-fullscreenCss
  • Hotfix/xxxx-homepageDisplay
  • Hotfix/xxxx-liveReleaseFixes
  • Hotfix/xxxx-partnerProjects
  • Hotfix/xxxx-workingFileIndex
  • Issue/1782-structualDataIntegration
  • Issue/1792-newMetadataStructure
  • Issue/1822-coscineUIv2App
  • Issue/1824-componentsUIv2
  • Issue/1824-routerAdditions
  • Issue/1825-codeQualityPipelines
  • Issue/1833-newLogin
  • Issue/1843-multipleFilesValidation
  • Issue/1860-searchScoping
  • Issue/1861-searchMetadata
  • Issue/1862-searchFacets
  • Issue/1863-paginationForSearch
  • Issue/1926-userProfile
  • Issue/1927-projectAppMigration
  • Issue/1928-sidebarmenuAddition
  • Issue/1929-vuexToPinia
  • Issue/1938-internalHandling
  • Issue/1951-quotaImplementation
  • Issue/1953-owlImports
  • Issue/1957-resourceAppMigration
  • Issue/1957-resourceAppMigrationNew
  • Issue/1962-SearchAppUI2
  • Issue/1964-tokenExpiryUIv2
  • Issue/1965-userListMigration
  • Issue/1970-breadcrumbs
  • Issue/1971-projectEditCreateMigration
  • Issue/1972-homeDepot
  • Issue/1974-shibbolethLogout
  • Issue/1976-resouceCreationVaildEmail
  • Issue/1979-supportAdminUIv2Migration
  • Issue/1980-userManagement
  • Issue/1985-adaptSidebar
  • Issue/2002-migrateResourceCreate
  • Issue/2003-resourceSettings
  • Issue/2008-quotaManagement
  • Issue/2011-pathConfig
  • Issue/2016-BannerMigration
  • 1.28.0-pilot
  • v1.0.0
  • v1.1.0
  • v1.10.0
  • v1.10.1
  • v1.10.2
  • v1.10.3
  • v1.11.0
  • v1.11.1
  • v1.11.2
  • v1.11.3
  • v1.11.4
  • v1.11.5
  • v1.11.6
  • v1.11.7
  • v1.12.0
  • v1.13.0
  • v1.14.0
  • v1.14.1
  • v1.14.2
  • v1.14.3
  • v1.15.0
  • v1.15.1
  • v1.16.0
  • v1.16.1
  • v1.16.2
  • v1.16.3
  • v1.17.0
  • v1.17.1
  • v1.17.2
  • v1.18.0
  • v1.18.1
  • v1.19.0
  • v1.2.0
  • v1.20.0
  • v1.20.1
  • v1.20.2
  • v1.20.3
  • v1.20.4
  • v1.20.5
  • v1.21.0
  • v1.22.0
  • v1.22.1
  • v1.22.2
  • v1.23.0
  • v1.23.1
  • v1.23.2
  • v1.23.3
  • v1.23.4
  • v1.23.5
  • v1.23.6
  • v1.23.6-patch-2417-2427
  • v1.24.0
  • v1.24.1
  • v1.25.0
  • v1.25.1
  • v1.26.0
  • v1.26.1
  • v1.27.0
  • v1.27.1
  • v1.27.1-pilot
  • v1.28.0
  • v1.29.0
  • v1.29.1
  • v1.29.2
  • v1.3.0
  • v1.30.0
  • v1.30.1
  • v1.30.2
  • v1.31.0
  • v1.32.0
  • v1.4.0
  • v1.4.1
  • v1.5.0
  • v1.6.0
  • v1.6.1
  • v1.6.2
  • v1.7.0
  • v1.8.0
  • v1.8.1
  • v1.8.2
  • v1.9.0
  • v2.0.0
  • v2.1.0
  • v2.10.0
  • v2.10.1
  • v2.11.0
  • v2.12.0
  • v2.12.1
  • v2.12.2
  • v2.12.3
  • v2.12.4
  • v2.12.5
  • v2.13.0
  • v2.13.1
  • v2.13.2
  • v2.13.3
  • v2.13.4
  • v2.14.0
  • v2.15.0
200 results
Show changes

Commits on Source 3

Showing
with 1000 additions and 106 deletions
......@@ -41,4 +41,4 @@ packageExtensions:
dependencies:
vue: ^2.7.15
yarnPath: .yarn/releases/yarn-4.0.0.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
{
"name": "ui",
"version": "2.5.1",
"version": "2.5.2",
"private": true,
"scripts": {
"dev": "vite",
......@@ -13,9 +13,9 @@
"coverage": "vitest run --coverage"
},
"dependencies": {
"@coscine/api-client": "^3.3.0",
"@coscine/form-generator": "^3.5.1",
"@dynamic-mapper/mapper": "^1.10.2",
"@coscine/api-client": "^3.3.1",
"@coscine/form-generator": "^3.5.3",
"@dynamic-mapper/mapper": "^1.10.4",
"@pinia/testing": "^0.1.3",
"@rdfjs-elements/formats-pretty": "^0.6.4",
"@rdfjs/data-model": "^2.0.1",
......@@ -24,20 +24,20 @@
"@rdfjs/types": "^1.1.0",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"@vueuse/core": "^10.5.0",
"axios": "^1.5.1",
"@vueuse/core": "^10.6.1",
"axios": "^1.6.2",
"bootstrap": "4.6.1",
"bootstrap-icons": "^1.11.1",
"bootstrap-vue": "^2.23.1",
"buffer": "^6.0.3",
"file-saver": "^2.0.5",
"http-status-codes": "^2.3.0",
"jose": "^4.15.4",
"jose": "^5.1.1",
"jquery": "^3.7.1",
"lodash": "^4.17.21",
"moment": "^2.29.4",
"pinia": "^2.1.7",
"rdf-canonize": "^3.4.0",
"rdf-canonize": "^4.0.1",
"rdf-ext": "^2.4.0",
"rdf-parse": "^2.3.2",
"rdf-validate-shacl": "^0.4.5",
......@@ -59,43 +59,42 @@
"@semantic-release/gitlab": "^12.0.6",
"@semantic-release/npm": "^10.0.6",
"@semantic-release/release-notes-generator": "^11.0.7",
"@types/file-saver": "^2.0.6",
"@types/lodash": "^4.14.200",
"@types/rdf-ext": "^2.2.4",
"@types/rdf-validate-shacl": "^0.4.5",
"@types/uuid": "^9.0.6",
"@types/vue-select": "^3.16.6",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-vue2": "^2.2.0",
"@vitest/coverage-c8": "^0.32.4",
"@vue/eslint-config-prettier": "^7.1.0",
"@vue/eslint-config-typescript": "^11.0.3",
"@vue/runtime-dom": "^3.3.7",
"@types/file-saver": "^2.0.7",
"@types/lodash": "^4.14.201",
"@types/rdf-ext": "^2.2.5",
"@types/rdf-validate-shacl": "^0.4.6",
"@types/uuid": "^9.0.7",
"@types/vue-select": "^3.16.7",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"@vitejs/plugin-vue2": "^2.3.1",
"@vitest/coverage-c8": "^0.33.0",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/runtime-dom": "^3.3.8",
"@vue/test-utils": "^1.3.6",
"conventional-changelog-eslint": "^4.0.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^8.10.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-functional": "^5.0.8",
"eslint-plugin-functional": "^6.0.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.18.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-vue": "^9.18.1",
"jsdom": "^22.1.0",
"jsdom-global": "^3.0.2",
"lint-staged": "^13.3.0",
"prettier": "^2.8.8",
"lint-staged": "^15.1.0",
"prettier": "^3.1.0",
"semantic-release": "^21.1.2",
"typescript": "^5.2.2",
"unplugin-vue-components": "^0.25.2",
"vite": "^4.5.0",
"vite": "^5.0.0",
"vite-aliases": "^0.11.3",
"vite-plugin-node-polyfills": "^0.9.0",
"vite-plugin-rewrite-all": "^1.0.1",
"vite-plugin-windicss": "^1.9.1",
"vitest": "^0.34.6",
"vue-template-compiler": "^2.7.15"
},
"packageManager": "yarn@4.0.0"
"packageManager": "yarn@4.0.2"
}
......@@ -160,7 +160,8 @@ a[target="_blank"]:after {
font-weight: normal;
color: unset;
font-family: "bootstrap-icons";
src: url("bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d")
src:
url("bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d")
format("woff2"),
url("bootstrap-icons.woff?856008caa5eb66df68595e734e59580d") format("woff");
}
......@@ -173,7 +174,8 @@ a[target="_blank"]:after {
font-weight: normal;
color: unset;
font-family: "bootstrap-icons";
src: url("bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d")
src:
url("bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d")
format("woff2"),
url("bootstrap-icons.woff?856008caa5eb66df68595e734e59580d") format("woff");
}
......
......@@ -77,19 +77,19 @@ export default defineComponent({
return this.$t("banner.maintenance.type.disturbance").toString();
case "Teilstörung":
return this.$t(
"banner.maintenance.type.partialDisturbance"
"banner.maintenance.type.partialDisturbance",
).toString();
case "Unterbrechung":
return this.$t("banner.maintenance.type.interruption").toString();
case "eingeschränkt betriebsfähig":
return this.$t(
"banner.maintenance.type.limitedOperation"
"banner.maintenance.type.limitedOperation",
).toString();
case "Wartung":
return this.$t("banner.maintenance.type.maintenance").toString();
case "Teilwartung":
return this.$t(
"banner.maintenance.type.partialMaintenance"
"banner.maintenance.type.partialMaintenance",
).toString();
default:
return this.$t("banner.maintenance.type.maintenance").toString();
......
......@@ -87,9 +87,9 @@ export default defineComponent({
) {
title = title.replace(
`${this.$t(
"resourceTypes." + this.resource.type.specificType + ".displayName"
"resourceTypes." + this.resource.type.specificType + ".displayName",
)}: `,
""
"",
);
}
this.setDocumentTitle(title);
......@@ -126,7 +126,7 @@ export default defineComponent({
path.trim() !== "" &&
path.trim() !== "p" &&
path.trim() !== "r" &&
path.trim() !== "-"
path.trim() !== "-",
);
},
......@@ -190,7 +190,7 @@ export default defineComponent({
if (this.resource.type?.specificType) {
// e.g. "RWTH-RDS-S3: My Resource Name"
return `${this.$t(
"resourceTypes." + this.resource.type.specificType + ".displayName"
"resourceTypes." + this.resource.type.specificType + ".displayName",
)}: ${this.resource.displayName}`;
}
return this.resource.displayName;
......
......@@ -158,7 +158,7 @@ export default defineComponent({
? `${this.$t(
"resourceTypes." +
resource.type.specificType +
".displayName"
".displayName",
)}: `
: "") + resource.displayName,
href: {
......@@ -176,7 +176,7 @@ export default defineComponent({
? `${this.$t(
"resourceTypes." +
resource.type.specificType +
".displayName"
".displayName",
)}: `
: "") + resource.displayName,
},
......@@ -274,17 +274,17 @@ export default defineComponent({
widthActive(): string {
if (this.sidebarActive) {
return getComputedStyle(document.documentElement).getPropertyValue(
"--sidebar-width-active"
"--sidebar-width-active",
);
} else {
return getComputedStyle(document.documentElement).getPropertyValue(
"--sidebar-default-width"
"--sidebar-default-width",
);
}
},
widthCollapsed(): string {
return getComputedStyle(document.documentElement).getPropertyValue(
"--sidebar-width-collapsed"
"--sidebar-width-collapsed",
);
},
},
......
......@@ -103,7 +103,7 @@ export default defineComponent({
) {
this.tokenExpiredInterval = this.setInterval(
this.notifyTokenExpired,
this.mainStore.getCurrentTokenExpirationDuration()
this.mainStore.getCurrentTokenExpirationDuration(),
);
}
},
......
......@@ -63,12 +63,12 @@ export default defineComponent({
return h("template", { slot: place }, [
h(value.el, { class: value.class }, value.value),
]);
}
},
);
toastBody = h(
"i18n",
{ props: { path: options.path, tag: options.tag } },
childNodes
childNodes,
);
}
// Build the toast body from a string
......
......@@ -5,7 +5,7 @@ import * as jose from "jose";
import { ref } from "vue";
const secret = jose.base64url.decode(
"zH4NRP1HMALxxCFnRZABFA7GOJtzU_gIj02alfL1lvI"
"zH4NRP1HMALxxCFnRZABFA7GOJtzU_gIj02alfL1lvI",
);
export const getTestMainState: () => Promise<MainState> = async () => {
......@@ -19,7 +19,7 @@ export const getTestMainState: () => Promise<MainState> = async () => {
.setIssuer("coscine")
.setAudience("coscine")
.setExpirationTime("2h")
.encrypt(secret)
.encrypt(secret),
),
},
clientcorrelation: {
......@@ -33,7 +33,7 @@ export const getTestMainState: () => Promise<MainState> = async () => {
maintenance: {},
maintenanceVisibility: useLocalStorage(
"coscine.banner.maintenanceVisibility",
""
"",
),
dateString: useLocalStorage("coscine.banner.dateString", ""),
},
......
......@@ -47,7 +47,7 @@ export const getTestResource: () => Promise<VisitedResourceObject> =
const ap = await parseRDFDefinition(
baseApplicationProfile,
baseApplicationProfileFormat,
apUrl
apUrl,
);
const resourceObject: VisitedResourceObject = {
applicationProfile: { uri: apUrl },
......
......@@ -28,17 +28,17 @@ const configuration = new MapperConfiguration((cfg) => {
disciplines: (opt) =>
opt.mapFromUsing(
(e) => e.disciplines,
DisciplineDto2DisciplineForProjectManipulationDto
DisciplineDto2DisciplineForProjectManipulationDto,
),
visibility: (opt) =>
opt.mapFromUsing(
(e) => e.visibility,
VisibilityDto2VisibilityForProjectManipulationDto
VisibilityDto2VisibilityForProjectManipulationDto,
),
organizations: (opt) =>
opt.mapFromUsing(
(e) => e.organizations,
OrganizationDto2OrganizationForProjectManipulationDto
OrganizationDto2OrganizationForProjectManipulationDto,
),
});
// Other maps
......
......@@ -76,22 +76,22 @@ const configuration = new MapperConfiguration((cfg) => {
.preCondition((e) => e.license?.id !== undefined)
.mapFromUsing(
(e) => e.license,
LicenseDto2LicenseForResourceManipulationDto
LicenseDto2LicenseForResourceManipulationDto,
),
visibility: (opt) =>
opt.mapFromUsing(
(e) => e.visibility,
VisibilityDto2VisibilityForResourceManipulationDto
VisibilityDto2VisibilityForResourceManipulationDto,
),
disciplines: (opt) =>
opt.mapFromUsing(
(e) => e.disciplines,
DisciplineDto2DisciplineForResourceManipulationDto
DisciplineDto2DisciplineForResourceManipulationDto,
),
resourceTypeOptions: (opt) =>
opt.mapFromUsing(
(e) => e.type?.options,
ResourceTypeOptionsDto2ResourceTypeOptionsForUpdateDto
ResourceTypeOptionsDto2ResourceTypeOptionsForUpdateDto,
),
});
......@@ -102,28 +102,28 @@ const configuration = new MapperConfiguration((cfg) => {
opt
.mapFromUsing(
(e) => e.gitLab,
GitLabOptionsDto2GitlabResourceTypeOptionsForUpdateDto
GitLabOptionsDto2GitlabResourceTypeOptionsForUpdateDto,
)
.condition((con) => con.gitLab !== undefined),
rdsResourceTypeOptions: (opt) =>
opt
.mapFromUsing(
(e) => e.rds,
RdsOptionsDto2RdsResourceTypeOptionsForManipulationDto
RdsOptionsDto2RdsResourceTypeOptionsForManipulationDto,
)
.condition((con) => con.rds !== undefined),
rdsS3ResourceTypeOptions: (opt) =>
opt
.mapFromUsing(
(e) => e.rdsS3,
RdsS3OptionsDto2RdsS3ResourceTypeOptionsForManipulationDto
RdsS3OptionsDto2RdsS3ResourceTypeOptionsForManipulationDto,
)
.condition((con) => con.rdsS3 !== undefined),
rdsS3WormResourceTypeOptions: (opt) =>
opt
.mapFromUsing(
(e) => e.rdsS3Worm,
RdsS3WormOptionsDto2RdsS3WormResourceTypeOptionsForManipulationDto
RdsS3WormOptionsDto2RdsS3WormResourceTypeOptionsForManipulationDto,
)
.condition((con) => con.rdsS3Worm !== undefined),
});
......@@ -131,50 +131,50 @@ const configuration = new MapperConfiguration((cfg) => {
linkedResourceTypeOptions: (opt) =>
opt
.preCondition(
(rti) => rti.generalType === CoscineResourceTypes.LinkedData.General
(rti) => rti.generalType === CoscineResourceTypes.LinkedData.General,
)
.mapFrom((rti) =>
rti.generalType === CoscineResourceTypes.LinkedData.General
? {}
: undefined
: undefined,
),
gitlabResourceTypeOptions: (opt) =>
opt
.preCondition(
(rti) => rti.generalType === CoscineResourceTypes.Gitlab.General
(rti) => rti.generalType === CoscineResourceTypes.Gitlab.General,
)
.mapFrom((rti) =>
rti.generalType === CoscineResourceTypes.Gitlab.General
? ({} as GitlabResourceTypeOptionsForCreationDto)
: undefined
: undefined,
),
rdsResourceTypeOptions: (opt) =>
opt
.preCondition(
(rti) => rti.generalType === CoscineResourceTypes.Rds.General
(rti) => rti.generalType === CoscineResourceTypes.Rds.General,
)
.mapFrom((rti) =>
rti.generalType === CoscineResourceTypes.Rds.General ? {} : undefined
rti.generalType === CoscineResourceTypes.Rds.General ? {} : undefined,
),
rdsS3ResourceTypeOptions: (opt) =>
opt
.preCondition(
(rti) => rti.generalType === CoscineResourceTypes.RdsS3.General
(rti) => rti.generalType === CoscineResourceTypes.RdsS3.General,
)
.mapFrom((rti) =>
rti.generalType === CoscineResourceTypes.RdsS3.General
? {}
: undefined
: undefined,
),
rdsS3WormResourceTypeOptions: (opt) =>
opt
.preCondition(
(rti) => rti.generalType === CoscineResourceTypes.RdsS3Worm.General
(rti) => rti.generalType === CoscineResourceTypes.RdsS3Worm.General,
)
.mapFrom((rti) =>
rti.generalType === CoscineResourceTypes.RdsS3Worm.General
? {}
: undefined
: undefined,
),
});
cfg.createAutoMap(GitLabOptionsDto2GitlabResourceTypeOptionsForUpdateDto, {});
......@@ -187,14 +187,14 @@ const configuration = new MapperConfiguration((cfg) => {
{
quota: (opt) =>
opt.mapFromUsing((e) => e.size, QuotaDto2QuotaForManipulationDto),
}
},
);
cfg.createAutoMap(
RdsS3WormOptionsDto2RdsS3WormResourceTypeOptionsForManipulationDto,
{
quota: (opt) =>
opt.mapFromUsing((e) => e.size, QuotaDto2QuotaForManipulationDto),
}
},
);
// Other maps
......
......@@ -41,20 +41,20 @@ const configuration = new MapperConfiguration((cfg) => {
disciplines: (opt) =>
opt.mapFromUsing(
(dto) => dto.disciplines,
DisciplineDto2DisciplineForUserManipulationDto
DisciplineDto2DisciplineForUserManipulationDto,
),
language: (opt) =>
opt.mapFromUsing(
(dto) => dto.language,
LanguageDto2LanguageForUserManipulationDto
LanguageDto2LanguageForUserManipulationDto,
),
institute: (opt) =>
opt.mapFrom((dto) =>
dto.institutes?.length ? dto.institutes[0].displayName : ""
dto.institutes?.length ? dto.institutes[0].displayName : "",
),
organization: (opt) =>
opt.mapFrom((dto) =>
dto.organizations?.length ? dto.organizations[0].displayName : null
dto.organizations?.length ? dto.organizations[0].displayName : null,
),
});
cfg.createAutoMap(TitleDto2TitleForUserManipulationDto, {});
......
......@@ -215,14 +215,14 @@ export default defineComponent({
return projectQuotas.map((entry) => {
// Find corresponding entry
const resourceType = this.resourceTypes?.find(
(q) => q.specificType === entry.resourceType?.specificType
(q) => q.specificType === entry.resourceType?.specificType,
);
// Populate the extended project quota object
const extended = {
...entry,
iDisplayName: this.$t(
`resourceTypes.${entry.resourceType?.specificType}.displayName`
`resourceTypes.${entry.resourceType?.specificType}.displayName`,
).toString(),
isEnabled: resourceType?.isEnabled,
isQuotaAvailable: resourceType?.isQuotaAvailable,
......@@ -323,7 +323,7 @@ export default defineComponent({
methods: {
async saveNewQuota(
project: ProjectDto | null | undefined,
resourceQuota: ExtendedProjectQuotaDto
resourceQuota: ExtendedProjectQuotaDto,
) {
if (
project &&
......@@ -340,7 +340,7 @@ export default defineComponent({
const success = await this.adminStore.updateProjectQuota(
project.id,
resourceQuota.resourceType.id,
quota
quota,
);
if (success) {
// On Success
......@@ -395,7 +395,7 @@ export default defineComponent({
},
formatUsed(quota: QuotaDto): string {
return FileUtil.formatBytes(
FileUtil.convertCapacityUnits(quota, QuotaUnit.Byte)
FileUtil.convertCapacityUnits(quota, QuotaUnit.Byte),
);
},
},
......
......@@ -69,8 +69,8 @@ describe("Admin", () => {
// Resource types that are "active" are displayed and their count is equal to the count in the store
expect(rowsOfEnabledOnlyResTypes.length).toEqual(
wrapper.vm.$pinia.state.value.resource.resourceTypes.filter(
(e: { isEnabled: boolean }) => e.isEnabled
).length
(e: { isEnabled: boolean }) => e.isEnabled,
).length,
);
quotaTable.vm.$data.showOnlyEnabledResources = false;
......@@ -80,7 +80,7 @@ describe("Admin", () => {
.findAll("tr");
// Resource types both "active" and "hidden" are displayed and their count is equal to the count in the store
expect(rowsOfEnabledAndHiddenResTypes.length).toBeGreaterThanOrEqual(
wrapper.vm.$pinia.state.value.resource.resourceTypes.length
wrapper.vm.$pinia.state.value.resource.resourceTypes.length,
);
// Ensure that input fields and buttons are rendered only on entries where isQuotaAvailable === true.
......@@ -107,7 +107,7 @@ describe("Admin", () => {
// If a button is present, it should be disabled when the input is empty
if (isButtonPresent) {
expect(
(buttons.at(0)?.element as HTMLButtonElement).disabled
(buttons.at(0)?.element as HTMLButtonElement).disabled,
).toBeTruthy();
}
......@@ -138,13 +138,13 @@ describe("Admin", () => {
// Check that only one input field has the value "5"
const inputWithValueFive = inputs.filter(
(input) => (input.element as HTMLInputElement).value === "5"
(input) => (input.element as HTMLInputElement).value === "5",
);
expect(inputWithValueFive.length).toBe(1);
// Check that only one button is enabled
const enabledButtons = buttons.filter(
(button) => !(button.element as HTMLButtonElement).disabled
(button) => !(button.element as HTMLButtonElement).disabled,
);
expect(enabledButtons.length).toBe(1);
}
......
......@@ -52,10 +52,10 @@ export const useAdminStore = defineStore({
try {
const apiProjectResponse = await ProjectApi.getProject(
projectString,
false
false,
);
const projectQuotas = await wrapListRequest((pageNumber: number) =>
ProjectQuotaApi.getProjectQuotas(projectString, pageNumber, 150)
ProjectQuotaApi.getProjectQuotas(projectString, pageNumber, 150),
);
this.project = apiProjectResponse.data.data;
this.projectQuotas = projectQuotas;
......@@ -67,7 +67,7 @@ export const useAdminStore = defineStore({
async updateProjectQuota(
projectId: string,
resourceTypeId: string,
quota: QuotaDto
quota: QuotaDto,
): Promise<boolean> {
const notificationStore = useNotificationStore();
try {
......@@ -78,7 +78,7 @@ export const useAdminStore = defineStore({
await ProjectQuotaApi.updateProjectQuota(
projectId,
resourceTypeId,
projectQuotaForUpdateDto
projectQuotaForUpdateDto,
);
return true;
} catch (error) {
......
......@@ -101,7 +101,7 @@ export default defineComponent({
? 1
: b.displayName > a.displayName
? -1
: 0
: 0,
);
return options;
},
......
......@@ -38,7 +38,7 @@ describe("ToS.vue", () => {
// initial state, Confirm Button is disabled
expect(wrapper.get("#confirmBtn").attributes()["disabled"]).toBe(
"disabled"
"disabled",
);
// check TosAccepted and PpAccepted
......@@ -50,7 +50,7 @@ describe("ToS.vue", () => {
// Confirm button should be active
expect(wrapper.get("#confirmBtn").attributes()["disabled"]).not.toBe(
"disabled"
"disabled",
);
});
......@@ -70,7 +70,7 @@ describe("ToS.vue", () => {
// initial state, Confirm Button is disabled
expect(wrapper.get("#confirmBtn").attributes()["disabled"]).toBe(
"disabled"
"disabled",
);
// check TosAccepted
......@@ -79,7 +79,7 @@ describe("ToS.vue", () => {
// Confirm button should be disabled, since PP not accepted
expect(wrapper.get("#confirmBtn").attributes()["disabled"]).toBe(
"disabled"
"disabled",
);
});
......@@ -99,7 +99,7 @@ describe("ToS.vue", () => {
// initial state, Confirm Button is disabled
expect(wrapper.get("#confirmBtn").attributes()["disabled"]).toBe(
"disabled"
"disabled",
);
// check PpAccepted
......@@ -108,7 +108,7 @@ describe("ToS.vue", () => {
// Confirm button should be disabled, since PP not accepted
expect(wrapper.get("#confirmBtn").attributes()["disabled"]).toBe(
"disabled"
"disabled",
);
});
});
......@@ -24,11 +24,11 @@ describe("Login Store", () => {
/* Fill the local storage */
localStorage.setItem(
"coscine.clientcorrelation.id",
"f7aef8bc-77f4-4679-9f5d-5724fbdf4513"
"f7aef8bc-77f4-4679-9f5d-5724fbdf4513",
);
localStorage.setItem(
"coscine.authorization.bearer",
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9..."
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...",
);
localStorage.setItem("coscine.locale", "en");
localStorage.setItem("coscine.banner.maintenanceVisibility", "");
......@@ -44,7 +44,7 @@ describe("Login Store", () => {
expect(localStorage.getItem("coscine.authorization.bearer")).toBeNull();
expect(sessionStorage.length).toBe(0);
expect(window.location.href).toBe(
"/coscine/api/Coscine.Api.STS/account/logout"
"/coscine/api/Coscine.Api.STS/account/logout",
);
});
});