Fix catalog TUI browse workflow

internal/cmd/course/course.go

@@ -85,6 +85,9 @@ func runCourseList(cmd *cobra.Command, opts courseListOpts) error {
 				}
 				return tui.TableResult{Rows: list.Rows, Total: list.Total, Page: list.Page}, nil
 			},
+			OnSelect: func(row map[string]any) error {
+				return runCourseView(cmd, fmt.Sprint(row["jwId"]))
+			},
 			EmptyMessage: "No courses found. Try a broader search.",
 		})
 	}
@@ -126,7 +129,7 @@ func courseListColumns() []output.Column {
 		{Header: "Code", Key: "code"},
 		{Header: "Name", Key: "namePrimary"},
 		{Header: "Level", Key: "educationLevel.name"},
-		{Header: "ID", Key: "id"},
+		{Header: "JW ID", Key: "jwId"},
 	}
 }
 
@@ -161,46 +164,50 @@ func newCmdView() *cobra.Command {
 		Short:   "View course details",
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			c, err := api.NewTypedClient(cmdutil.ServerFromCmd(cmd), false)
-			if err != nil {
-				return err
-			}
-			jwID, err := cmdutil.Int64PtrIfSet(args[0])
-			if err != nil {
-				return err
-			}
-			data, err := api.ParseResponseRaw(c.GetCourse(api.Ctx(), *jwID))
-			if err != nil {
-				return err
-			}
-			if output.IsJSON() {
-				return output.JSON(data)
-			}
-			m := cmdutil.AsMap(data)
-			output.KVWithTitle([]output.KVPair{
-				{Key: "ID", Value: output.Resolve(m, "id")},
-				{Key: "Code", Value: output.Resolve(m, "code")},
-				{Key: "Name", Value: output.Resolve(m, "namePrimary")},
-				{Key: "Name (EN)", Value: output.Resolve(m, "nameSecondary")},
-				{Key: "Level", Value: output.Resolve(m, "educationLevel.name")},
-				{Key: "Category", Value: output.Resolve(m, "category.name")},
-				{Key: "Class type", Value: output.Resolve(m, "classType.name")},
-				{Key: "Gradation", Value: output.Resolve(m, "gradation.name")},
-				{Key: "Course type", Value: output.Resolve(m, "type.name")},
-			}, "Course")
-
-			if sections, ok := m["sections"].([]any); ok && len(sections) > 0 {
-				fmt.Println()
-				output.Bold("  Sections")
-				rows := cmdutil.RowsFromAny(sections)
-				output.Table(rows, []output.Column{
-					{Header: "ID", Key: "id"},
-					{Header: "Code", Key: "code"},
-					{Header: "Semester", Key: "semester.name"},
-					{Header: "Campus", Key: "campus.name"},
-				})
-			}
-			return nil
+			return runCourseView(cmd, args[0])
 		},
 	}
 }
+
+func runCourseView(cmd *cobra.Command, id string) error {
+	c, err := api.NewTypedClient(cmdutil.ServerFromCmd(cmd), false)
+	if err != nil {
+		return err
+	}
+	jwID, err := cmdutil.Int64PtrIfSet(id)
+	if err != nil {
+		return err
+	}
+	data, err := api.ParseResponseRaw(c.GetCourse(api.Ctx(), *jwID))
+	if err != nil {
+		return err
+	}
+	if output.IsJSON() {
+		return output.JSON(data)
+	}
+	m := cmdutil.AsMap(data)
+	output.KVWithTitle([]output.KVPair{
+		{Key: "ID", Value: output.Resolve(m, "id")},
+		{Key: "Code", Value: output.Resolve(m, "code")},
+		{Key: "Name", Value: output.Resolve(m, "namePrimary")},
+		{Key: "Name (EN)", Value: output.Resolve(m, "nameSecondary")},
+		{Key: "Level", Value: output.Resolve(m, "educationLevel.name")},
+		{Key: "Category", Value: output.Resolve(m, "category.name")},
+		{Key: "Class type", Value: output.Resolve(m, "classType.name")},
+		{Key: "Gradation", Value: output.Resolve(m, "gradation.name")},
+		{Key: "Course type", Value: output.Resolve(m, "type.name")},
+	}, "Course")
+
+	if sections, ok := m["sections"].([]any); ok && len(sections) > 0 {
+		fmt.Println()
+		output.Bold("  Sections")
+		rows := cmdutil.RowsFromAny(sections)
+		output.Table(rows, []output.Column{
+			{Header: "ID", Key: "id"},
+			{Header: "Code", Key: "code"},
+			{Header: "Semester", Key: "semester.name"},
+			{Header: "Campus", Key: "campus.name"},
+		})
+	}
+	return nil
+}

internal/cmd/course/course_test.go

@@ -0,0 +1,11 @@
+package course
+
+import "testing"
+
+func TestCourseListUsesViewIdentifier(t *testing.T) {
+	columns := courseListColumns()
+	last := columns[len(columns)-1]
+	if last.Header != "JW ID" || last.Key != "jwId" {
+		t.Fatalf("last column = %#v, want JW ID backed by jwId", last)
+	}
+}

internal/cmd/section/section.go

@@ -107,6 +107,9 @@ func runSectionList(cmd *cobra.Command, opts sectionListOpts) error {
 				}
 				return tui.TableResult{Rows: list.Rows, Total: list.Total, Page: list.Page}, nil
 			},
+			OnSelect: func(row map[string]any) error {
+				return runSectionView(cmd, fmt.Sprint(row["jwId"]))
+			},
 			EmptyMessage: "No sections found. Try a broader search.",
 		})
 	}
@@ -156,7 +159,7 @@ func sectionListColumns() []output.Column {
 		{Header: "Course", Key: "course.namePrimary"},
 		{Header: "Semester", Key: "semester.name"},
 		{Header: "Campus", Key: "campus.name"},
-		{Header: "ID", Key: "id"},
+		{Header: "JW ID", Key: "jwId"},
 	}
 }
 
@@ -194,60 +197,64 @@ func newCmdView() *cobra.Command {
 		Short:   "View section details",
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			c, err := api.NewTypedClient(cmdutil.ServerFromCmd(cmd), false)
-			if err != nil {
-				return err
-			}
-			jwID, err := cmdutil.Int64PtrIfSet(args[0])
-			if err != nil {
-				return err
-			}
-			data, err := api.ParseResponseRaw(c.GetSection(api.Ctx(), *jwID))
-			if err != nil {
-				return err
-			}
-			if output.IsJSON() {
-				return output.JSON(data)
-			}
-			m := cmdutil.AsMap(data)
-			output.KVWithTitle([]output.KVPair{
-				{Key: "ID", Value: output.Resolve(m, "id")},
-				{Key: "Code", Value: output.Resolve(m, "code")},
-				{Key: "Course", Value: output.Resolve(m, "course.namePrimary")},
-				{Key: "Semester", Value: output.Resolve(m, "semester.name")},
-				{Key: "Campus", Value: output.Resolve(m, "campus.name")},
-			}, "Section")
+			return runSectionView(cmd, args[0])
+		},
+	}
+}
 
-			if teachers, ok := m["teachers"].([]any); ok && len(teachers) > 0 {
-				fmt.Println()
-				output.Bold("  Teachers")
-				rows := cmdutil.RowsFromAny(teachers)
-				output.Table(rows, []output.Column{
-					{Header: "ID", Key: "id"},
-					{Header: "Name", Key: "namePrimary"},
-					{Header: "Name (EN)", Key: "nameSecondary"},
-					{Header: "Department", Key: "department.name"},
-				})
-			}
+func runSectionView(cmd *cobra.Command, id string) error {
+	c, err := api.NewTypedClient(cmdutil.ServerFromCmd(cmd), false)
+	if err != nil {
+		return err
+	}
+	jwID, err := cmdutil.Int64PtrIfSet(id)
+	if err != nil {
+		return err
+	}
+	data, err := api.ParseResponseRaw(c.GetSection(api.Ctx(), *jwID))
+	if err != nil {
+		return err
+	}
+	if output.IsJSON() {
+		return output.JSON(data)
+	}
+	m := cmdutil.AsMap(data)
+	output.KVWithTitle([]output.KVPair{
+		{Key: "ID", Value: output.Resolve(m, "id")},
+		{Key: "Code", Value: output.Resolve(m, "code")},
+		{Key: "Course", Value: output.Resolve(m, "course.namePrimary")},
+		{Key: "Semester", Value: output.Resolve(m, "semester.name")},
+		{Key: "Campus", Value: output.Resolve(m, "campus.name")},
+	}, "Section")
 
-			if schedules, ok := m["schedules"].([]any); ok && len(schedules) > 0 {
-				fmt.Println()
-				output.Bold("  Schedules")
-				rows := cmdutil.RowsFromAny(schedules)
-				for _, row := range rows {
-					normalizeScheduleRow(row)
-				}
-				output.Table(rows, []output.Column{
-					{Header: "ID", Key: "id"},
-					{Header: "Day", Key: "weekday"},
-					{Header: "Start", Key: "startTime"},
-					{Header: "End", Key: "endTime"},
-					{Header: "Place", Key: "customPlace"},
-				})
-			}
-			return nil
-		},
+	if teachers, ok := m["teachers"].([]any); ok && len(teachers) > 0 {
+		fmt.Println()
+		output.Bold("  Teachers")
+		rows := cmdutil.RowsFromAny(teachers)
+		output.Table(rows, []output.Column{
+			{Header: "ID", Key: "id"},
+			{Header: "Name", Key: "namePrimary"},
+			{Header: "Name (EN)", Key: "nameSecondary"},
+			{Header: "Department", Key: "department.name"},
+		})
+	}
+
+	if schedules, ok := m["schedules"].([]any); ok && len(schedules) > 0 {
+		fmt.Println()
+		output.Bold("  Schedules")
+		rows := cmdutil.RowsFromAny(schedules)
+		for _, row := range rows {
+			normalizeScheduleRow(row)
+		}
+		output.Table(rows, []output.Column{
+			{Header: "ID", Key: "id"},
+			{Header: "Day", Key: "weekday"},
+			{Header: "Start", Key: "startTime"},
+			{Header: "End", Key: "endTime"},
+			{Header: "Place", Key: "customPlace"},
+		})
 	}
+	return nil
 }
 
 func newCmdSchedules() *cobra.Command {

internal/cmd/section/section_test.go

@@ -119,3 +119,11 @@ func TestNormalizeScheduleRow_FullRow(t *testing.T) {
 		t.Errorf("endTime: got %v, want 10:40", got)
 	}
 }
+
+func TestSectionListUsesViewIdentifier(t *testing.T) {
+	columns := sectionListColumns()
+	last := columns[len(columns)-1]
+	if last.Header != "JW ID" || last.Key != "jwId" {
+		t.Fatalf("last column = %#v, want JW ID backed by jwId", last)
+	}
+}

internal/cmd/teacher/teacher.go

@@ -84,6 +84,9 @@ func runTeacherList(cmd *cobra.Command, opts teacherListOpts) error {
 				}
 				return tui.TableResult{Rows: list.Rows, Total: list.Total, Page: list.Page}, nil
 			},
+			OnSelect: func(row map[string]any) error {
+				return runTeacherView(cmd, fmt.Sprint(row["id"]))
+			},
 			EmptyMessage: "No teachers found. Try a broader search.",
 		})
 	}
@@ -152,43 +155,47 @@ func newCmdView() *cobra.Command {
 		Short:   "View teacher details",
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			c, err := api.NewTypedClient(cmdutil.ServerFromCmd(cmd), false)
-			if err != nil {
-				return err
-			}
-			teacherID, err := strconv.ParseInt(args[0], 10, 64)
-			if err != nil {
-				return fmt.Errorf("invalid teacher id %q: %w", args[0], err)
-			}
-			data, err := api.ParseResponseRaw(c.GetTeacher(api.Ctx(), teacherID))
-			if err != nil {
-				return err
-			}
-			if output.IsJSON() {
-				return output.JSON(data)
-			}
-			m := cmdutil.AsMap(data)
-			output.KVWithTitle([]output.KVPair{
-				{Key: "ID", Value: output.Resolve(m, "id")},
-				{Key: "Code", Value: output.Resolve(m, "code")},
-				{Key: "Name", Value: output.Resolve(m, "namePrimary")},
-				{Key: "Name (EN)", Value: output.Resolve(m, "nameSecondary")},
-				{Key: "Department", Value: output.Resolve(m, "department.name")},
-				{Key: "Title", Value: output.Resolve(m, "title")},
-			}, "Teacher")
-
-			if sections, ok := m["sections"].([]any); ok && len(sections) > 0 {
-				fmt.Println()
-				output.Bold("  Sections")
-				rows := cmdutil.RowsFromAny(sections)
-				output.Table(rows, []output.Column{
-					{Header: "ID", Key: "id"},
-					{Header: "Code", Key: "code"},
-					{Header: "Course", Key: "course.namePrimary"},
-					{Header: "Semester", Key: "semester.name"},
-				})
-			}
-			return nil
+			return runTeacherView(cmd, args[0])
 		},
 	}
 }
+
+func runTeacherView(cmd *cobra.Command, id string) error {
+	c, err := api.NewTypedClient(cmdutil.ServerFromCmd(cmd), false)
+	if err != nil {
+		return err
+	}
+	teacherID, err := strconv.ParseInt(id, 10, 64)
+	if err != nil {
+		return fmt.Errorf("invalid teacher id %q: %w", id, err)
+	}
+	data, err := api.ParseResponseRaw(c.GetTeacher(api.Ctx(), teacherID))
+	if err != nil {
+		return err
+	}
+	if output.IsJSON() {
+		return output.JSON(data)
+	}
+	m := cmdutil.AsMap(data)
+	output.KVWithTitle([]output.KVPair{
+		{Key: "ID", Value: output.Resolve(m, "id")},
+		{Key: "Code", Value: output.Resolve(m, "code")},
+		{Key: "Name", Value: output.Resolve(m, "namePrimary")},
+		{Key: "Name (EN)", Value: output.Resolve(m, "nameSecondary")},
+		{Key: "Department", Value: output.Resolve(m, "department.name")},
+		{Key: "Title", Value: output.Resolve(m, "title")},
+	}, "Teacher")
+
+	if sections, ok := m["sections"].([]any); ok && len(sections) > 0 {
+		fmt.Println()
+		output.Bold("  Sections")
+		rows := cmdutil.RowsFromAny(sections)
+		output.Table(rows, []output.Column{
+			{Header: "ID", Key: "id"},
+			{Header: "Code", Key: "code"},
+			{Header: "Course", Key: "course.namePrimary"},
+			{Header: "Semester", Key: "semester.name"},
+		})
+	}
+	return nil
+}