General changes (#848)

IgnisDa · IgnisDa · commit 0d8009580aea · 2024-05-26T19:30:30.000+05:30
* feat(backend): remove useless genre

* fix(backend): add relation between entities

* fix(backend): select correct entity

* ci: use action script to construct name

* build(backend): bump version

* ci: construct multiple docker names

* feat(frontend): display text when no collection

* chore(frontend): handle cases when no reviews

* fix(frontend): set as default value

ci: use correct context
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -80,14 +80,28 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get docker image name and build args
+      - name: Get docker image names
         id: required_args
-        run: |
-          image_name="${{ env.REGISTRY }}/${{ github.actor }}/${{ github.event.repository.name }}"
-          image_names="$image_name:${{ github.ref_name }},$image_name:latest"
-          # lowercase the name
-          image_names=$(echo "$image_names" | tr '[:upper:]' '[:lower:]')
-          echo "image_names=$image_names" >> $GITHUB_OUTPUT
+        uses: actions/github-script@v7
+        with:
+          script: |
+            function generateVersionArray(version) {
+            	const parts = version.split(".");
+            	let versionArray = [];
+            	for (let i = 0; i < parts.length; i++)
+            		versionArray.push(parts.slice(0, i + 1).join("."));
+            	return versionArray;
+            }
+
+            const registry = process.env.REGISTRY;
+            const actor = context.actor;
+            const repoName = context.payload.repository.name;
+            const refName = context.ref.replace('refs/tags/', '');
+            const imageName = `${registry}/${actor}/${repoName}`;
+            const versionTags = generateVersionArray(refName);
+            const tags = versionTags.map(tag => `${imageName}:${tag}`);
+            const imageNames = tags.join(',').toLowerCase();
+            core.setOutput('image_names', imageNames);
 
       - name: Build and push to ghcr
         uses: docker/build-push-action@v5
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/backend/Cargo.toml b/apps/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ryot"
-version = "5.4.4"
+version = "5.4.5"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-3.0"
diff --git a/apps/backend/src/entities/genre.rs b/apps/backend/src/entities/genre.rs
@@ -27,4 +27,10 @@ impl Related<super::metadata::Entity> for Entity {
     }
 }
 
+impl Related<super::metadata_to_genre::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::MetadataToGenre.def()
+    }
+}
+
 impl ActiveModelBehavior for ActiveModel {}
diff --git a/apps/backend/src/miscellaneous/resolver.rs b/apps/backend/src/miscellaneous/resolver.rs
@@ -7083,6 +7083,18 @@ WHERE id IN (
                 .exec(&self.db)
                 .await?;
         }
+        let mut genre_stream = Genre::find()
+            .select_only()
+            .column(genre::Column::Id)
+            .left_join(MetadataToGenre)
+            .filter(metadata_to_genre::Column::MetadataId.is_null())
+            .into_tuple::<i32>()
+            .stream(&self.db)
+            .await?;
+        while let Some(genre) = genre_stream.try_next().await? {
+            tracing::debug!("Removing genre id = {:#?}", genre);
+            Genre::delete_by_id(genre).exec(&self.db).await?;
+        }
         Ok(())
     }
 
diff --git a/apps/frontend/app/routes/_dashboard.collections.$id._index.tsx b/apps/frontend/app/routes/_dashboard.collections.$id._index.tsx
@@ -336,19 +336,23 @@ export default function Page() {
 						</Tabs.Panel>
 						{!loaderData.userPreferences.disableReviews ? (
 							<Tabs.Panel value="reviews">
-								<Stack>
-									{loaderData.info.reviews.map((r) => (
-										<ReviewItemDisplay
-											title={loaderData.info.details.name}
-											review={r}
-											key={r.id}
-											collectionId={loaderData.id}
-											reviewScale={loaderData.userPreferences.reviewScale}
-											user={loaderData.userDetails}
-											entityType="collection"
-										/>
-									))}
-								</Stack>
+								{loaderData.info.reviews.length > 0 ? (
+									<Stack>
+										{loaderData.info.reviews.map((r) => (
+											<ReviewItemDisplay
+												title={loaderData.info.details.name}
+												review={r}
+												key={r.id}
+												collectionId={loaderData.id}
+												reviewScale={loaderData.userPreferences.reviewScale}
+												user={loaderData.userDetails}
+												entityType="collection"
+											/>
+										))}
+									</Stack>
+								) : (
+									<Text>No reviews</Text>
+								)}
 							</Tabs.Panel>
 						) : null}
 					</Tabs>
diff --git a/apps/frontend/app/routes/_dashboard.collections.list.tsx b/apps/frontend/app/routes/_dashboard.collections.list.tsx
@@ -154,6 +154,9 @@ type UpdateCollectionInput = {
 export default function Page() {
 	const transition = useNavigation();
 	const loaderData = useLoaderData<typeof loader>();
+	const userCreatedCollections = loaderData.collections.filter(
+		(c) => !c.isDefault,
+	);
 
 	const [toUpdateCollection, setToUpdateCollection] =
 		useState<UpdateCollectionInput>();
@@ -201,18 +204,20 @@ export default function Page() {
 							</Tabs.Tab>
 						</Tabs.List>
 						<Tabs.Panel value="userCreated">
-							<SimpleGrid cols={{ base: 1, md: 2 }}>
-								{loaderData.collections
-									.filter((c) => !c.isDefault)
-									.map((c) => (
+							{userCreatedCollections.length > 0 ? (
+								<SimpleGrid cols={{ base: 1, md: 2 }}>
+									{userCreatedCollections.map((c) => (
 										<DisplayCollection
 											key={c.id}
 											collection={c}
 											setToUpdateCollection={setToUpdateCollection}
 											openModal={createOrUpdateModalOpen}
 										/>
 									))}
-							</SimpleGrid>
+								</SimpleGrid>
+							) : (
+								<Text>You have not created any collections yet</Text>
+							)}
 						</Tabs.Panel>
 						<Tabs.Panel value="systemCreated">
 							<SimpleGrid cols={{ base: 1, md: 2 }}>
diff --git a/apps/frontend/app/routes/_dashboard.media.groups.item.$id._index.tsx b/apps/frontend/app/routes/_dashboard.media.groups.item.$id._index.tsx
@@ -232,19 +232,23 @@ export default function Page() {
 						{!loaderData.userPreferences.disableReviews ? (
 							<Tabs.Panel value="reviews">
 								<MediaScrollArea>
-									<Stack>
-										{loaderData.userMetadataGroupDetails.reviews.map((r) => (
-											<ReviewItemDisplay
-												review={r}
-												key={r.id}
-												metadataGroupId={loaderData.metadataGroupId}
-												reviewScale={loaderData.userPreferences.reviewScale}
-												user={loaderData.userDetails}
-												title={loaderData.metadataGroupDetails.details.title}
-												entityType="metadataGroup"
-											/>
-										))}
-									</Stack>
+									{loaderData.userMetadataGroupDetails.reviews.length > 0 ? (
+										<Stack>
+											{loaderData.userMetadataGroupDetails.reviews.map((r) => (
+												<ReviewItemDisplay
+													review={r}
+													key={r.id}
+													metadataGroupId={loaderData.metadataGroupId}
+													reviewScale={loaderData.userPreferences.reviewScale}
+													user={loaderData.userDetails}
+													title={loaderData.metadataGroupDetails.details.title}
+													entityType="metadataGroup"
+												/>
+											))}
+										</Stack>
+									) : (
+										<Text>No reviews</Text>
+									)}
 								</MediaScrollArea>
 							</Tabs.Panel>
 						) : null}
diff --git a/apps/frontend/app/routes/_dashboard.media.item.$id._index.tsx b/apps/frontend/app/routes/_dashboard.media.item.$id._index.tsx
@@ -1863,7 +1863,7 @@ const IndividualProgressModal = (props: {
 							</Text>
 							<Flex align="center" gap="xs">
 								<NumberInput
-									value={((props.total || 1) * (value || 1)) / 100}
+									defaultValue={((props.total || 1) * (value || 1)) / 100}
 									onChange={(v) => {
 										const newVal = (Number(v) / (props.total || 1)) * 100;
 										setValue(newVal);
diff --git a/apps/frontend/app/routes/_dashboard.media.people.item.$id._index.tsx b/apps/frontend/app/routes/_dashboard.media.people.item.$id._index.tsx
@@ -351,19 +351,23 @@ export default function Page() {
 						{!loaderData.userPreferences.disableReviews ? (
 							<Tabs.Panel value="reviews">
 								<MediaScrollArea>
-									<Stack>
-										{loaderData.userPersonDetails.reviews.map((r) => (
-											<ReviewItemDisplay
-												review={r}
-												key={r.id}
-												personId={loaderData.personId}
-												title={loaderData.personDetails.details.name}
-												user={loaderData.userDetails}
-												reviewScale={loaderData.userPreferences.reviewScale}
-												entityType="person"
-											/>
-										))}
-									</Stack>
+									{loaderData.userPersonDetails.reviews.length > 0 ? (
+										<Stack>
+											{loaderData.userPersonDetails.reviews.map((r) => (
+												<ReviewItemDisplay
+													review={r}
+													key={r.id}
+													personId={loaderData.personId}
+													title={loaderData.personDetails.details.name}
+													user={loaderData.userDetails}
+													reviewScale={loaderData.userPreferences.reviewScale}
+													entityType="person"
+												/>
+											))}
+										</Stack>
+									) : (
+										<Text>No reviews</Text>
+									)}
 								</MediaScrollArea>
 							</Tabs.Panel>
 						) : null}

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,10 @@ impl Related<super::metadata::Entity> for Entity {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
	`30`	`+impl Related<super::metadata_to_genre::Entity> for Entity {`
	`31`	`+ fn to() -> RelationDef {`
	`32`	`+ Relation::MetadataToGenre.def()`
	`33`	`+ }`
	`34`	`+}`
	`35`	`+`
`30`	`36`	`impl ActiveModelBehavior for ActiveModel {}`