Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/booker #284

Merged
merged 3 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ Alla märkbara ändringar ska dokumenteras i denna fil.
Baserat på [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
och följer [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.16.0] - 2024-02-03

### Tillagt
- Booker och BoookingAdmin som features

## [1.15.0]
- added hidden flag functionality to activities
- query activities to include or exclude hidden activities
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ekorre-ts",
"version": "1.15.0",
"version": "1.16.0",
"description": "E-Sektionens backend",
"main": "src/index.ts",
"scripts": {
Expand Down
6 changes: 4 additions & 2 deletions src/models/generated/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ export enum Feature {
ActivityAdmin = 'activity_admin',
AhsAdmin = 'ahs_admin',
ArticleEditor = 'article_editor',
Booker = 'booker',
BookingAdmin = 'booking_admin',
DecibelAdmin = 'decibel_admin',
ElectionAdmin = 'election_admin',
EmailAdmin = 'email_admin',
Expand Down Expand Up @@ -995,7 +997,7 @@ export type Query = {
*/
export type QueryActivitiesArgs = {
from: Scalars['DateTime'];
includeHidden: Scalars['Boolean'];
includeHidden?: InputMaybe<Scalars['Boolean']>;
to: Scalars['DateTime'];
utskott: Array<Utskott>;
};
Expand Down Expand Up @@ -1974,7 +1976,7 @@ export type ProposalResolvers<ContextType = Context, ParentType extends Resolver
}>;

export type QueryResolvers<ContextType = Context, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = ResolversObject<{
activities?: Resolver<Array<ResolversTypes['Activity']>, ParentType, ContextType, RequireFields<QueryActivitiesArgs, 'from' | 'includeHidden' | 'to' | 'utskott'>>;
activities?: Resolver<Array<ResolversTypes['Activity']>, ParentType, ContextType, RequireFields<QueryActivitiesArgs, 'from' | 'to' | 'utskott'>>;
activity?: Resolver<ResolversTypes['Activity'], ParentType, ContextType, RequireFields<QueryActivityArgs, 'id'>>;
apiKey?: Resolver<ResolversTypes['ApiKey'], ParentType, ContextType, RequireFields<QueryApiKeyArgs, 'key'>>;
apiKeys?: Resolver<Array<ResolversTypes['ApiKey']>, ParentType, ContextType>;
Expand Down
2 changes: 2 additions & 0 deletions src/reducers/access.reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ const featureDescriptions: Record<Feature, string> = {
[Feature.AhsAdmin]: 'För att kunna administrera AHS',
[Feature.ActivityAdmin]: 'För att kunna administrera aktiviteter',
[Feature.DecibelAdmin]: 'För att kunna gå in på decibel',
[Feature.Booker]: 'För att kunna boka på bokaboka',
[Feature.BookingAdmin]: 'För att kunna administrera bokningar på bokaboka',
};

export const featureReducer = (features: Feature[]): FeatureInfo[] => {
Expand Down
2 changes: 2 additions & 0 deletions src/schemas/access.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,6 @@ enum Feature {
ahs_admin,
activity_admin
decibel_admin,
booking_admin,
booker
}
Loading