Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/unkeyed/unkey
Browse files Browse the repository at this point in the history
  • Loading branch information
chronark committed Nov 14, 2024
2 parents 6cde3d9 + 8458a03 commit 0c99dfc
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
5 changes: 0 additions & 5 deletions .changeset/little-melons-collect.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"use client";

import { Loading } from "@/components/dashboard/loading";
import { MultiSelect } from "@/components/multi-select";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";

Expand Down Expand Up @@ -105,7 +104,6 @@ export const CreateNewRole: React.FC<Props> = ({ trigger, permissions }) => {
<DialogTitle>Create a new role</DialogTitle>
<DialogDescription>Roles group permissions together.</DialogDescription>
</DialogHeader>

<Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col gap-8">
<FormField
Expand Down Expand Up @@ -147,7 +145,8 @@ export const CreateNewRole: React.FC<Props> = ({ trigger, permissions }) => {
</FormItem>
)}
/>
{permissions && permissions.length > 0 ? (
{/* Broken Have to link permissions on next page after creation */}
{/*{permissions && permissions.length > 0 ? (
<FormField
control={form.control}
name="permissionOptions"
Expand Down Expand Up @@ -176,7 +175,7 @@ export const CreateNewRole: React.FC<Props> = ({ trigger, permissions }) => {
</FormItem>
)}
/>
) : null}
) : null}*/}
<DialogFooter>
<Button type="submit">
{createRole.isLoading ? <Loading className="w-4 h-4" /> : "Create"}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @unkey/nextjs

## 0.18.0

### Minor Changes

- 77ca701: upgrade types to match nextjs 15

## 0.17.7

### Patch Changes
Expand Down
13 changes: 10 additions & 3 deletions packages/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
{
"name": "@unkey/nextjs",
"version": "0.17.7",
"version": "0.18.0",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"license": "MIT",
"private": false,
"publishConfig": {
"access": "public"
},
"keywords": ["unkey", "client", "api"],
"keywords": [
"unkey",
"client",
"api"
],
"bugs": {
"url": "https://github.com/unkeyed/unkey/issues"
},
"homepage": "https://github.com/unkeyed/unkey#readme",
"files": ["./dist/**", "README.md"],
"files": [
"./dist/**",
"README.md"
],
"author": "Andreas Thomas <[email protected]>",
"scripts": {
"build": "tsup"
Expand Down

0 comments on commit 0c99dfc

Please sign in to comment.