@@ -6,7 +6,8 @@ import { EnvironmentId, ProjectId, type ScopedProjectRef } from "@t3tools/contra
66import { describe , expect , it } from "vite-plus/test" ;
77
88import {
9- ALL_PROJECTS_CHOOSER_VALUE ,
9+ projectChooserMode ,
10+ projectFilterFromMode ,
1011 projectChooserState ,
1112 projectFilterFromChooser ,
1213 showOnlyProjectFilter ,
@@ -30,6 +31,7 @@ const web = {
3031const groups = [ api , web ] ;
3132
3233const filterOf = ( ...selected : Array < typeof api > ) : ProjectFilter => ( {
34+ mode : "include" ,
3335 entries : selected . map ( ( group ) => ( { key : group . projectKey , members : group . memberProjectRefs } ) ) ,
3436} ) ;
3537const values = ( filter : ProjectFilter ) =>
@@ -48,31 +50,48 @@ describe("project chooser", () => {
4850 mode : "exclude" ,
4951 } ) ;
5052 expect ( projectFilterFromChooser ( filter , [ ] , groups ) ) . toEqual ( { entries : [ ] , mode : "exclude" } ) ;
51- expect (
52- projectFilterFromChooser ( filter , [ web . projectKey , ALL_PROJECTS_CHOOSER_VALUE ] , groups ) ,
53- ) . toEqual ( { entries : [ ] , mode : "exclude" } ) ;
5453 expect ( showOnlyProjectFilter ( api ) ) . toEqual ( filterOf ( api ) ) ;
5554 } ) ;
5655
5756 it ( "exclusion can pick its first hidden project from an empty selection" , ( ) => {
5857 const empty : ProjectFilter = { mode : "exclude" , entries : [ ] } ;
5958 expect ( projectChooserState ( empty , groups ) . label ) . toBe ( "Projects: All" ) ;
60- expect (
61- projectFilterFromChooser ( empty , [ ALL_PROJECTS_CHOOSER_VALUE , web . projectKey ] , groups ) ,
62- ) . toEqual ( { ...filterOf ( web ) , mode : "exclude" } ) ;
59+ expect ( projectFilterFromChooser ( empty , [ web . projectKey ] , groups ) ) . toEqual ( {
60+ ...filterOf ( web ) ,
61+ mode : "exclude" ,
62+ } ) ;
6363 } ) ;
6464
65- it ( "Empty: an empty filter selects All projects and reads Projects: All " , ( ) => {
65+ it ( "All heads the list and is selected without counting as a project pick " , ( ) => {
6666 const state = projectChooserState ( ALL_PROJECTS_FILTER , groups ) ;
67- expect ( state . value . map ( ( item ) => item . value ) ) . toEqual ( [ ALL_PROJECTS_CHOOSER_VALUE ] ) ;
67+ expect ( state . value . map ( ( item ) => item . value ) ) . toEqual ( [ "all" ] ) ;
6868 expect ( state . label ) . toBe ( "Projects: All" ) ;
6969 expect ( state . count ) . toBe ( 0 ) ;
7070 expect ( state . single ) . toBeNull ( ) ;
71- expect ( state . items . map ( ( item ) => item . value ) ) . toEqual ( [
72- ALL_PROJECTS_CHOOSER_VALUE ,
73- api . projectKey ,
74- web . projectKey ,
75- ] ) ;
71+ expect ( state . items . map ( ( item ) => item . value ) ) . toEqual ( [ "all" , api . projectKey , web . projectKey ] ) ;
72+ } ) ;
73+
74+ it ( "All resets picks, while picking a project from All drops its sentinel" , ( ) => {
75+ expect ( projectFilterFromChooser ( filterOf ( api ) , [ api . projectKey , "all" ] , groups ) ) . toBe (
76+ ALL_PROJECTS_FILTER ,
77+ ) ;
78+ expect (
79+ projectFilterFromChooser (
80+ { ...filterOf ( web ) , mode : "exclude" } ,
81+ [ web . projectKey , "all" ] ,
82+ groups ,
83+ ) ,
84+ ) . toBe ( ALL_PROJECTS_FILTER ) ;
85+ expect ( projectFilterFromChooser ( ALL_PROJECTS_FILTER , [ "all" , api . projectKey ] , groups ) ) . toEqual (
86+ filterOf ( api ) ,
87+ ) ;
88+ const excluding : ProjectFilter = { mode : "exclude" , entries : [ ] } ;
89+ expect ( projectFilterFromChooser ( excluding , [ "all" , web . projectKey ] , groups ) ) . toEqual ( {
90+ ...filterOf ( web ) ,
91+ mode : "exclude" ,
92+ } ) ;
93+ expect ( projectFilterFromChooser ( excluding , [ ] , groups ) ) . toBe ( ALL_PROJECTS_FILTER ) ;
94+ expect ( projectFilterFromChooser ( ALL_PROJECTS_FILTER , [ ] , groups ) ) . toBe ( ALL_PROJECTS_FILTER ) ;
7695 } ) ;
7796
7897 it ( "Label: one entry shows its name, several show a count" , ( ) => {
@@ -108,24 +127,36 @@ describe("project chooser", () => {
108127 const removed = projectFilterFromChooser ( added , [ web . projectKey ] , groups ) ;
109128 expect ( removed ) . toEqual ( filterOf ( web ) ) ;
110129
111- // From All projects, the combobox reports All beside the new pick.
112- const fromAll = projectFilterFromChooser (
113- ALL_PROJECTS_FILTER ,
114- [ ALL_PROJECTS_CHOOSER_VALUE , api . projectKey ] ,
115- groups ,
116- ) ;
130+ const fromAll = projectFilterFromChooser ( ALL_PROJECTS_FILTER , [ api . projectKey ] , groups ) ;
117131 expect ( fromAll ) . toEqual ( filterOf ( api ) ) ;
118132 } ) ;
119133
120- it ( "Toggle: All projects clears the filter, and unpicking the last entry returns to all" , ( ) => {
121- expect (
122- projectFilterFromChooser (
123- filterOf ( api , web ) ,
124- [ api . projectKey , web . projectKey , ALL_PROJECTS_CHOOSER_VALUE ] ,
125- groups ,
126- ) ,
127- ) . toBe ( ALL_PROJECTS_FILTER ) ;
128- expect ( projectFilterFromChooser ( filterOf ( api ) , [ ] , groups ) ) . toBe ( ALL_PROJECTS_FILTER ) ;
134+ it ( "unselecting the last project shows none until All resets the filter" , ( ) => {
135+ const none = projectFilterFromChooser ( filterOf ( api ) , [ ] , groups ) ;
136+ expect ( none ) . toEqual ( { mode : "include" , entries : [ ] } ) ;
137+ expect ( projectChooserState ( none , groups ) ) . toMatchObject ( {
138+ label : "Projects: None" ,
139+ titleLabel : "No projects" ,
140+ value : [ ] ,
141+ single : null ,
142+ } ) ;
143+ expect ( projectFilterFromMode ( none , "all" ) ) . toBe ( ALL_PROJECTS_FILTER ) ;
144+ expect ( projectFilterFromMode ( filterOf ( api , web ) , "all" ) ) . toBe ( ALL_PROJECTS_FILTER ) ;
145+ } ) ;
146+
147+ it ( "mode switches preserve picks, including empty selections and legacy filters" , ( ) => {
148+ expect ( projectChooserMode ( ALL_PROJECTS_FILTER ) ) . toBe ( "all" ) ;
149+ expect ( projectChooserMode ( { entries : filterOf ( api ) . entries } ) ) . toBe ( "include" ) ;
150+ const excluded = projectFilterFromMode ( filterOf ( api , web ) , "exclude" ) ;
151+ expect ( projectChooserMode ( excluded ) ) . toBe ( "exclude" ) ;
152+ expect ( excluded . entries ) . toEqual ( filterOf ( api , web ) . entries ) ;
153+ expect ( projectFilterFromMode ( excluded , "include" ) ) . toEqual ( filterOf ( api , web ) ) ;
154+ const none = projectFilterFromMode ( ALL_PROJECTS_FILTER , "include" ) ;
155+ expect ( projectChooserMode ( none ) ) . toBe ( "include" ) ;
156+ expect ( projectChooserState ( none , groups ) . label ) . toBe ( "Projects: None" ) ;
157+ const allExceptNone = projectFilterFromMode ( none , "exclude" ) ;
158+ expect ( projectChooserState ( allExceptNone , groups ) . label ) . toBe ( "Projects: All" ) ;
159+ expect ( projectChooserMode ( allExceptNone ) ) . toBe ( "exclude" ) ;
129160 } ) ;
130161
131162 it ( "Offline: an entry no group carries stays selected and is marked unavailable" , ( ) => {
0 commit comments