[Back] ProductDeletePhoto | ProductPostMovePhoto | Remove Cover - [Fr…

…ont] DelegateDataGrid | GuidImage | AdminProductPhotoAction | AdminProductPhotoEditCaption | AdminProductPhotoEditDelete | AdminProductPhotoEditReplace | MakeCoverCol | ProductCarousel | usePhoto | useMovePhoto | useGet
opentelekomcloud · Mar 2, 2024 · 85fb050 · 85fb050
1 parent 82f809c
commit 85fb050
Show file tree

Hide file tree

Showing 43 changed files with 386 additions and 277 deletions.
diff --git a/TSystems.LoveOTC/AdminHub/Product/Delete.cs b/TSystems.LoveOTC/AdminHub/Product/Delete.cs
@@ -9,15 +9,25 @@ internal partial class AdminHub {
      * <remarks>
      * @author Aloento
      * @since 0.1.0
-     * @version 0.2.0
+     * @version 0.3.0
      * </remarks>
      */
     public async Task<bool> ProductDeletePhoto(uint photoId) {
-        var res = await this.Db.Photos
-            .Where(x => x.PhotoId == photoId)
+        var where = this.Db.Photos
+            .Where(x => x.PhotoId == photoId);
+
+        var objId = await where
+            .Select(x => x.ObjectId)
+            .SingleAsync();
+
+        await this.Db.Objects
+            .Where(x => x.Id == objId)
             .ExecuteDeleteAsync();
 
-        return res > 0;
+        await where
+            .ExecuteDeleteAsync();
+
+        return true;
     }
 
     /**

diff --git a/TSystems.LoveOTC/AdminHub/Product/Post.cs b/TSystems.LoveOTC/AdminHub/Product/Post.cs
@@ -38,7 +38,7 @@ public async Task<uint> ProductPostCreate(string name) {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 1.0.0
+     * @version 1.1.0
      * </remarks>
      */
     public async Task<bool> ProductPostMovePhoto(uint photoId, bool up) {
@@ -57,14 +57,18 @@ public async Task<bool> ProductPostMovePhoto(uint photoId, bool up) {
             if (current == 1)
                 throw new HubException("Photo already at top");
 
+            var prev = photos[index - 1].Order;
+
             photos[index - 1].Order = current;
-            photos[index].Order = (byte)(current - 1);
+            photos[index].Order = prev;
         } else {
             if (current == photos.Last().Order)
                 throw new HubException("Photo already at bottom");
 
+            var next = photos[index + 1].Order;
+
             photos[index + 1].Order = current;
-            photos[index].Order = (byte)(current + 1);
+            photos[index].Order = next;
         }
 
         await this.Db.SaveChangesAsync();

diff --git a/TSystems.LoveOTC/Hub/Product/Get.cs b/TSystems.LoveOTC/Hub/Product/Get.cs
@@ -32,12 +32,13 @@ public Task<uint[]> ProductGetComboList(uint prodId) =>
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.2.0
+     * @version 0.2.1
      * </remarks>
      */
     public Task<uint[]> ProductGetPhotoList(uint prodId) =>
         this.Db.Photos
             .Where(x => x.ProductId == prodId)
+            .OrderBy(x => x.Order)
             .Select(x => x.PhotoId)
             .ToArrayAsync();
 }
diff --git a/TSystems.LoveOTC/Migrations/20240107210741_Init.Designer.cs b/TSystems.LoveOTC/Migrations/20240107210741_Init.Designer.cs
diff --git a/TSystems.LoveOTC/Migrations/20240107210741_Init.cs b/TSystems.LoveOTC/Migrations/20240107210741_Init.cs
@@ -128,7 +128,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     PhotoId = table.Column<long>(type: "bigint", nullable: false),
-                    Cover = table.Column<bool>(type: "boolean", nullable: true),
                     Caption = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: true),
                     Order = table.Column<byte>(type: "smallint", nullable: false),
                     ObjectId = table.Column<Guid>(type: "uuid", nullable: false),

diff --git a/TSystems.LoveOTC/Migrations/ShopContextModelSnapshot.cs b/TSystems.LoveOTC/Migrations/ShopContextModelSnapshot.cs
@@ -17,10 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.0")
-                .HasAnnotation("Proxies:ChangeTracking", false)
-                .HasAnnotation("Proxies:CheckEquality", false)
-                .HasAnnotation("Proxies:LazyLoading", true)
+                .HasAnnotation("ProductVersion", "8.0.2")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseHiLo(modelBuilder, "EntityFrameworkHiLoSequence");
@@ -215,9 +212,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("character varying(100)");
 
-                    b.Property<bool?>("Cover")
-                        .HasColumnType("boolean");
-
                     b.Property<Guid>("ObjectId")
                         .HasColumnType("uuid");
 

diff --git a/TSystems.LoveOTC/Models/Photo.cs b/TSystems.LoveOTC/Models/Photo.cs
@@ -8,14 +8,12 @@ namespace TSystems.LoveOTC.Models;
  * <remarks>
  * @author Aloento
  * @since 0.1.0
- * @version 0.1.0
+ * @version 0.2.0
  * </remarks>
  */
 public class Photo : Concurrency {
     public uint PhotoId { get; set; }
 
-    public bool? Cover { get; set; }
-
     [StringLength(100)]
     public string? Caption { get; set; }
 

diff --git a/src/Components/DataGrid/index.tsx b/src/Components/DataGrid/index.tsx
@@ -1,11 +1,6 @@
 import { DataGrid, DataGridBody, DataGridHeader, DataGridRow, SkeletonItem, TableColumnDefinition, TableRowId } from "@fluentui/react-components";
 
-/**
- * @author Aloento
- * @since 0.1.0
- * @version 0.2.1
- */
-export interface IDataGrid<T extends { Id: TableRowId; }> {
+interface IDataGrid<T> {
   Items: T[] | undefined;
   Columns: TableColumnDefinition<T>[];
   NoHeader?: true;
@@ -14,14 +9,18 @@ export interface IDataGrid<T extends { Id: TableRowId; }> {
 /**
  * @author Aloento
  * @since 0.1.0
- * @version 0.2.1
+ * @version 0.3.0
  */
-export function DelegateDataGrid<T extends { Id: TableRowId; }>({ Items, Columns, NoHeader }: IDataGrid<T>) {
+export function DelegateDataGrid<T>({ Items, Columns, NoHeader }: IDataGrid<T> & { getRowId: (item: T) => TableRowId }): JSX.Element;
+export function DelegateDataGrid<T extends { Id: TableRowId; }>({ Items, Columns, NoHeader }: IDataGrid<T>): JSX.Element;
+export function DelegateDataGrid<T>({ Items, Columns, NoHeader, getRowId }: IDataGrid<T> & { getRowId?: (item: T) => TableRowId }) {
+  const id = getRowId || ((item: T & { Id: TableRowId; }) => item.Id);
+
   return (
     <DataGrid
       items={Items || []}
       columns={Columns}
-      getRowId={(item: T) => item.Id}
+      getRowId={id}
     >
       {
         !NoHeader &&

diff --git a/src/Components/Order/Drawer.tsx b/src/Components/Order/Drawer.tsx
@@ -98,7 +98,7 @@ export function OrderDetailDrawer({ OrderId, Admin, ParentLog }: IOrderComp) {
           :
           <DelegateDataGrid
             Items={cart}
-            Columns={[MakeCoverCol(44, ParentLog), ...columns]}
+            Columns={[MakeCoverCol(44, ParentLog, (x: ICartItem) => x.Cover), ...columns]}
           />
       }
 

diff --git a/src/Components/ShopCart/Columns.tsx b/src/Components/ShopCart/Columns.tsx
@@ -92,7 +92,7 @@ const columns: TableColumnDefinition<ICartItem>[] = [
  */
 export function CartColumns(log: Logger): TableColumnDefinition<ICartItem>[] {
   return [
-    MakeCoverCol(44, log),
+    MakeCoverCol(44, log, x => x.Cover),
     ...columns
   ];
 }
diff --git a/src/Helpers/CoverCol.tsx b/src/Helpers/CoverCol.tsx
@@ -24,12 +24,12 @@ const useStyles = makeStyles({
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.2.0
+ * @version 1.0.0
  */
-export function MakeCoverCol(size: number, log: Logger) {
+export function MakeCoverCol<T>(size: number, log: Logger, fac: (item: T) => string) {
   const w = { width: `${size}px` };
 
-  return createTableColumn<{ Cover: string; }>({
+  return createTableColumn<T>({
     columnId: "Cover",
     renderHeaderCell: () => {
       const style = useStyles();
@@ -42,14 +42,15 @@ export function MakeCoverCol(size: number, log: Logger) {
     },
     renderCell(item) {
       const style = useStyles();
+      const cover = fac(item);
 
       return (
         <DataGridCell className={style.unset}>
           <GuidImage
             className={style.img}
             style={w}
-            Guid={item.Cover}
-            Log={log}
+            Guid={cover}
+            ParentLog={log}
           />
         </DataGridCell>
       )

diff --git a/src/Helpers/GuidImage.tsx b/src/Helpers/GuidImage.tsx
@@ -1,26 +1,20 @@
 import { Image } from "@fluentui/react-components";
-import { useConst } from "@fluentui/react-hooks";
-import { useRequest } from "ahooks";
-import { ComponentProps, useEffect } from "react";
+import { ComponentProps } from "react";
 import { Hub } from "~/ShopNet";
-import type { Logger } from "./Logger";
+import type { ICompLog } from "./Logger";
+
+const hold = (txt: string) => "https://placehold.co/400?text=" + txt + "...";
 
 /**
  * @author Aloento
  * @since 1.0.0
- * @version 0.2.1
+ * @version 0.3.0
  */
-export function GuidImage({ Guid, Log, ...rest }: { Guid?: string, Log: Logger } & ComponentProps<typeof Image>) {
-  const log = useConst(() => Log.With("GuidImage"));
-
-  const { data, run } = useRequest(Hub.Storage.GetBySlice.bind(Hub.Storage), {
-    manual: true,
-    onError: log.error,
-  });
+export function GuidImage({ Guid, ParentLog, ...rest }: { Guid?: string } & ComponentProps<typeof Image> & ICompLog) {
+  if (!Guid)
+    return <Image {...rest} src={hold("Pending")} />;
 
-  useEffect(() => {
-    Guid && run(Guid, log);
-  }, [Guid]);
+  const { data } = Hub.Storage.useGet(Guid, ParentLog);
 
-  return <Image {...rest} src={data ? URL.createObjectURL(new Blob(data)) : "https://placehold.co/400?text=Loading..."} />;
+  return <Image {...rest} src={data ? URL.createObjectURL(new Blob(data)) : hold("Loading")} />;
 }
diff --git a/src/Pages/Admin/Product/Add.tsx b/src/Pages/Admin/Product/Add.tsx
@@ -34,7 +34,6 @@ export function AdminProductAddButton() {
   const { dispatch, dispatchToast } = useErrorToast(log);
 
   const { run, loading } = AdminHub.Product.Post.useCreate({
-    manual: true,
     onError(e, params) {
       dispatch({
         Message: `Failed Create ${name}`,

diff --git a/src/Pages/Admin/Product/Category.tsx b/src/Pages/Admin/Product/Category.tsx
@@ -44,7 +44,6 @@ export function AdminProductCategory({ ProdId }: { ProdId: number; }) {
   const { dispatch, dispatchToast } = useErrorToast(log);
 
   const { run } = AdminHub.Product.Patch.useCategory({
-    manual: true,
     onError(e, params) {
       dispatch({
         Message: "Failed Update Category",
@@ -65,7 +64,6 @@ export function AdminProductCategory({ ProdId }: { ProdId: number; }) {
   });
 
   const { run: det } = AdminHub.Product.Delete.useCategory({
-    manual: true,
     onError(e, params) {
       dispatch({
         Message: "Failed Detach Category",

diff --git a/src/Pages/Admin/Product/Combo/Delete.tsx b/src/Pages/Admin/Product/Combo/Delete.tsx
@@ -15,7 +15,6 @@ export function AdminProductComboDelete({ ComboId, Refresh }: { ComboId: number;
   const { dispatch, dispatchToast } = useErrorToast(log);
 
   const { run } = AdminHub.Product.Delete.useCombo({
-    manual: true,
     onError(e, req) {
       dispatch({
         Message: "Failed Delete Combo",

diff --git a/src/Pages/Admin/Product/Combo/New.tsx b/src/Pages/Admin/Product/Combo/New.tsx
@@ -92,7 +92,6 @@ export function AdminProductNewCombo({ ProdId, Refresh }: { ProdId: number; Refr
   const { dispatch, dispatchToast } = useErrorToast(log);
 
   const { run } = AdminHub.Product.Post.useCombo({
-    manual: true,
     onError(e, req) {
       dispatch({
         Message: "Failed Create Combo",

diff --git a/src/Pages/Admin/Product/Combo/index.tsx b/src/Pages/Admin/Product/Combo/index.tsx
@@ -121,7 +121,7 @@ const columns: TableColumnDefinition<IDetailComboItem>[] = [
  * @version 0.2.2
  */
 export function AdminProductCombo({ ProdId }: { ProdId: number }) {
-  const { data, run } = useRequest(() => Hub.Product.Get.ComboItem(ProdId, log), {
+  const { data, run } = useRequest(() => Hub.Product.Get.ComboList(ProdId, log), {
     onError: log.error
   });
 

diff --git a/src/Pages/Admin/Product/Delete.tsx b/src/Pages/Admin/Product/Delete.tsx
@@ -24,7 +24,6 @@ export function AdminProductDelete({ ProdId }: { ProdId: number }) {
   const { dispatch, dispatchToast } = useErrorToast(log);
 
   const { run, loading } = AdminHub.Product.Delete.useProduct({
-    manual: true,
     onError(e, params) {
       dispatch({
         Message: "Failed Delete Product",

diff --git a/src/Pages/Admin/Product/Lexical.tsx b/src/Pages/Admin/Product/Lexical.tsx
@@ -39,7 +39,6 @@ export function AdminProductLexical({ ProdId }: { ProdId: number }) {
   const { dispatch, dispatchToast } = useErrorToast(log);
 
   const { run } = AdminHub.Product.Post.useLexical({
-    manual: true,
     onError(e, req) {
       dispatch({
         Message: "Failed Update Description",

diff --git a/src/Pages/Admin/Product/Name.tsx b/src/Pages/Admin/Product/Name.tsx
@@ -32,7 +32,6 @@ export function AdminProductName({ ProdId }: { ProdId: number; }) {
   const { dispatch, dispatchToast } = useErrorToast(log);
 
   const { run } = AdminHub.Product.Patch.useName({
-    manual: true,
     onError(e, req) {
       dispatch({
         Message: "Failed Update Name",