Merge branch 'rc' of https://github.com/BEXIS2/Core into rc

Author: DavidBlaa

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/CreateController.cs

@@ -370,7 +370,7 @@ public JsonResult Create(CreateModel data)
                     dm.EditDatasetVersion(workingCopy, null, null, null);
 
                     // close check out
-                    dm.CheckInDataset(datasetId, "Init creation a " + entityTemplate.EntityType.Name.ToLower() + " based on " + entityTemplate.Name.ToLower(), GetUsernameOrDefault(), ViewCreationBehavior.None, TagType.Copy);
+                    dm.CheckInDataset(datasetId,  entityTemplate.EntityType.Name + " created based on category: " + entityTemplate.Name, GetUsernameOrDefault(), ViewCreationBehavior.None, TagType.Copy);
                 }
 
                 #endregion update version

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/lib/components/Card.svelte

@@ -23,7 +23,7 @@
 		entitytemplate: ''
 	};
 
- export let authorLabel = 'Authors';
+	export let authorLabel = 'Authors';
 
 	const { title, description, author, license, id, doi, entity, date, entitytemplate } = card;
 
@@ -84,6 +84,7 @@
 		on:keydown={() => window.open(`/ddm/data/Showdata/${id}`)}
 		role="link"
 		tabindex="0"
+		title="View dataset details in a new tab"
 	>
 		<div class="flex flex-col w-full gap-4">
 			<div class="justify-between flex gap-2">
@@ -122,15 +123,15 @@
 				</div>
 				<div class="ml-auto flex gap-2">
 					{#if entitytemplate && entitytemplate.length > 0}
-						<div title="Entity Template" class="rounded-full px-3 p-1 bg-primary-500">
+						<div title="Entity Category" class="rounded-full px-3 p-1 bg-primary-500">
 							<span class="text-sm font-semibold text-on-secondary-token"
 								>{entitytemplate.toLowerCase()}</span
 							>
 						</div>
 					{/if}
 
 					{#if entity && entity.length > 0}
-						<div title="Entity" class="rounded-full px-3 p-1 bg-primary-500">
+						<div title="Entity Type" class="rounded-full px-3 p-1 bg-primary-500">
 							<span class="text-sm font-semibold text-on-secondary-token"
 								>{entity.toLowerCase()}</span
 							>

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/lib/components/Cards.svelte

@@ -56,7 +56,7 @@
 			select="!px-3 !py-1.5 select min-w-[150px]"
 			showFirstLastButtons
 			showPreviousNextButtons
-			on:page ={e => paginationSettings.page = e.detail}
+			on:page={(e) => (paginationSettings.page = e.detail)}
 		/>
 	{/if}
 </div>

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/lib/components/Search.svelte

@@ -249,7 +249,8 @@
 
 		if (placeholders.length > 0) {
 			const idIndex = headers.findIndex((header) => header.Name === 'ID');
-   authorLabel = headers[headers.findIndex((header) => header.Placeholder === 'author')]?.DisplayName
+			authorLabel =
+				headers[headers.findIndex((header) => header.Placeholder === 'author')]?.DisplayName;
 			const data = rows.map((row) => ({
 				...placeholders.reduce(
 					(acc, item) => {
@@ -265,13 +266,10 @@
 
 			placeholderStore.set(data);
 
-			console.log("🚀 ~ data ~ data:", data, authorLabel)
+			console.log('🚀 ~ data ~ data:', data, authorLabel);
 		}
 	};
 
-
-
-
 	const deleteCriteriaKey = (criterion: string, value: string) => {
 		const temp = { ...$criteria };
 		temp[criterion].values = temp[criterion].values.filter((v) => v !== value);
@@ -527,7 +525,7 @@
 									placeholder="Search within selected category"
 								/>
 								<button
-									title="Search"
+									title="Apply selected search criteria"
 									class="btn variant-filled-primary"
 									on:click|preventDefault={async () => await handleSearch()}>Search</button
 								>
@@ -549,7 +547,7 @@
 									{#if $criteria[key].values.length < 3}
 										{#each $criteria[key].values as value, index (`${key}-${value}`)}
 											<CriteriaChip
-												title="Click to remove search term {value}"
+												title="Click to remove search term: {value}"
 												on:remove={async () => {
 													if ($criteria[key].type === 'Facet') {
 														await toggleFacet(key, value);
@@ -594,7 +592,7 @@
 					</div>
 				{/if}
 				<div class:hidden={currentView === 'table'}>
-					<Cards store={placeholderStore} {authorLabel}/>
+					<Cards store={placeholderStore} {authorLabel} />
 				</div>
 			</div>
 		</div>

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/lib/components/ShowData.svelte

@@ -5,6 +5,6 @@
 	export let row;
 </script>
 
-<a href="/ddm/data/Showdata/{row.iD}" target="_blank" class="btn variant-filled-primary">
+<a href="/ddm/data/Showdata/{row.iD}" target="_blank" class="btn variant-filled-primary" title="View dataset details in a new tab">
 	<Fa icon={faEye} size="xs" />
 </a>

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/routes/taginfo/TagInfoEdit.svelte

@@ -105,15 +105,15 @@
 		if (responce.status === 200) {
 			notificationStore.showNotification({
 				notificationType: notificationType.success,
-				message: 'Tag is generated.'
+				message: 'Release Tag is generated.'
 			});
 
 			reload();
 			dispatch('reload');
 		} else {
 			notificationStore.showNotification({
 				notificationType: notificationType.error,
-				message: 'Tag is not generated.'
+				message: 'Release Tag is not generated.'
 			});
 		}
 	}
@@ -179,7 +179,7 @@
 						disableSorting: true
 					},
 					systemDescription: {
-						header: 'System Description',
+						header: 'General Type',
 						disableFiltering: true,
 						disableSorting: true,
 						instructions: {
@@ -219,6 +219,10 @@
 						},
 						disableFiltering: true,
 						disableSorting: true
+					},
+					link: {
+						disableFiltering: true,
+						exclude: true
 					}
 				}
 			}}

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/routes/taginfo/TagInfoView.svelte

@@ -30,12 +30,12 @@
 		<TablePlaceholder cols={2} {rows} />
 	</div>
 {:then model}
-	<h2 class="h2">Tag Preview</h2>
+	<h2 class="h2">Preview</h2>
 	<table class="table table-compact bg-tertiary-200">
 		<thead>
 			<tr class="bg-primary-300">
-				<th class="!p-2 w-16">Tag</th>
-				<th class="!p-2">Release Note</th>
+				<th scope="col" class="!p-2 w-16">Release Tag</th>
+				<th scope="col" class="!p-2">Release Note</th>
 			</tr>
 		</thead>
 		<tbody>

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/routes/taginfo/table/tableOptions.svelte

@@ -10,7 +10,6 @@
 	let noTag: boolean = hasNoTag();
 	// use auto-subscription so changes to the store re-run reactive statements
 	let withMinor: boolean;
-
 	$: withMinor = $withMinorStore;
 
 	function hasNoTag() {
@@ -43,12 +42,12 @@
 	$: hasChanges = (() => {
 		const originalRows = $originalTagInfoModelStore;
 		const currentRow = $tagInfoModelStore.find((x) => x.versionId == row.versionId);
-		console.log('🚀 ~ hasChanges ~ currentRow:', currentRow);
-		if (!currentRow) return false;
-
 		const originalRow = originalRows.find((x) => x.versionId == row.versionId);
+
+		if (!currentRow) return false; // No current row
 		if (!originalRow) return true; // New row
 
+		// Return true if there are changes, otherwise false
 		return (
 			currentRow.releaseNote !== originalRow.releaseNote ||
 			currentRow.publish !== originalRow.publish ||
@@ -58,7 +57,8 @@
 </script>
 
 <div class="flex gap-2 w-min p-2">
-	{#if hasChanges}
+	{row.tagId}
+	{#if hasChanges && row.tagId > 0}
 		<button
 			class="btn btn-sm variant-filled-primary"
 			title="Save changes"
@@ -72,13 +72,13 @@
 		{#if withMinor}
 			<button
 				class="btn btn-sm variant-filled-primary"
-				title="Create new minor version"
+				title="Create new minor version. All untagged versions until this will belong to this minor version."
 				on:click|preventDefault={() => eventDispatchFn('MINOR')}>minor</button
 			>
 		{/if}
 		<button
 			class="btn btn-sm variant-filled-primary"
-			title="Create new major version"
+			title="Create new major version. All untagged versions until this will belong to this major version."
 			on:click|preventDefault={() => eventDispatchFn('MAJOR')}>major</button
 		>
 	{/if}

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/routes/taginfo/table/tablePublish.svelte

@@ -9,6 +9,7 @@
 
 	$: currentRow = $tagInfoModelStore.find((x) => x.versionId == row.original.versionId);
 
+	// Update the store when the toggle is changed
 	function togglePublish(versionId: number, value: boolean) {
 		tagInfoModelStore.update((arr) =>
 			arr.map((x) => (x.versionId === versionId ? { ...x, publish: !!value } : x))
@@ -17,7 +18,7 @@
 </script>
 
 <div class="flex h-full items-center justify-center">
-	<div title="Make this release tag visible; Click save to apply">
+	<div title="Make this release tag visible; Click save to apply changes.">
 		{#if currentRow.tagId > 0}
 			<SlideToggle
 				name={currentRow.versionId}

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/routes/taginfo/table/tableReleaseNote.svelte

@@ -20,7 +20,7 @@
 	}
 </script>
 
-<span title="Release Note; Click save to apply">
+<span title="Release Note; Click save to apply changes.">
 	<TextArea
 		bind:value={currentRow.releaseNote}
 		on:input={() =>