wip: add lenses scoped

packages/app/src/app/teams/[team]/lenses/new/page.tsx

@@ -1,20 +1,23 @@
-import { SubNav, SubNavTitle, SubNavSubtitle } from '@/components/sub-nav'
+import { SubNav, SubNavTitle } from '@/components/sub-nav'
 import { Section } from '@/components/section'
 import { NewLensForm } from '@/components/lenses/new-form'
+import { type PropsWithChildren } from 'react'
 
-export default function Page() {
+export interface NextPageProps<TeamSlug = string> {
+  params: { team: TeamSlug }
+  searchParams?: { [key: string]: string | string[] | undefined }
+}
+
+export const revalidate = 0 // no cache
+
+export default function Page(props: PropsWithChildren<NextPageProps>) {
   return (
     <>
       <SubNav>
-        <SubNavTitle>
-          New Lens
-          <SubNavSubtitle>
-            Measure workloads against best practices.
-          </SubNavSubtitle>
-        </SubNavTitle>
+        <SubNavTitle>New Lens</SubNavTitle>
       </SubNav>
       <Section>
-        <NewLensForm />
+        <NewLensForm teamSlug={props.params.team} />
       </Section>
     </>
   )

packages/app/src/app/teams/[team]/lenses/page.tsx

@@ -43,7 +43,7 @@ export default async function Page(props: PropsWithChildren<NextPageProps>) {
           </SubNavSubtitle>
         </SubNavTitle>
         <SubNavActions>
-          <AddLensButton />
+          <AddLensButton teamSlug={searchParams.slug} />
         </SubNavActions>
       </SubNav>
       <Main className="space-y-8 p-8">

packages/app/src/app/teams/[team]/solutions/[id]/page.tsx

@@ -12,17 +12,17 @@ import {
   CardTitle,
   CardDescription
 } from '@/components/ui/card'
-import DateFormat from '@/components/date-format'
-import { Section } from '@/components/section'
+import { ActionsMenu } from './components/actions-menu'
 import { api } from '@/trpc/server-http'
-import { CommentForm } from './components/comment-form'
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
+import { Button } from '@/components/ui/button'
 import { CommentActions } from './components/comment-actions'
+import { CommentForm } from './components/comment-form'
 import { remark } from 'remark'
+import { Section } from '@/components/section'
+import DateFormat from '@/components/date-format'
 import html from 'remark-html'
 import Markdown from 'react-markdown'
-import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
-import { Button } from '@/components/ui/button'
-import { ActionsMenu } from './components/actions-menu'
 
 export type PageProps = {
   params: { id: string }
@@ -56,7 +56,7 @@ export default async function Page({ params }: PageProps) {
                     src={solution?.user?.image}
                     alt={solution?.user?.name}
                   />
-                  <AvatarFallback>{}</AvatarFallback>
+                  <AvatarFallback>{ }</AvatarFallback>
                 </Avatar>
               </Button>
             </CardTitle>
@@ -116,7 +116,7 @@ export default async function Page({ params }: PageProps) {
                       src={comment.user?.image}
                       alt={comment.user?.name}
                     />
-                    <AvatarFallback>{}</AvatarFallback>
+                    <AvatarFallback>{ }</AvatarFallback>
                   </Avatar>
                 </Button>
                 <CommentActions comment={comment} />

packages/app/src/components/dashboard/profiles/new-form.action.tsx

@@ -5,16 +5,17 @@ import { createAction, protectedProcedure } from '@/server/trpc'
 import { rhfActionSchema } from './new-form.schema'
 import { createProfile } from '@/db/services/profiles'
 import { isAllowed } from '@/server/trpc'
+import { revalidatePath } from 'next/cache'
 
 export const rhfAction = createAction(
   protectedProcedure
     .use(isAllowed('write'))
     .input(rhfActionSchema)
-    .mutation(
-      async opts =>
-        await createProfile({
-          ...opts.input,
-          scope: { resourceType: 'profile', ownerId: opts.ctx.meta.ownerId }
-        })
-    )
+    .mutation(async opts => {
+      revalidatePath('/teams/[id]/lenses', 'page')
+      return await createProfile({
+        ...opts.input,
+        scope: { resourceType: 'profile', ownerId: opts.ctx.meta.ownerId }
+      })
+    })
 )

packages/app/src/components/lenses/add-button.tsx

@@ -1,15 +1,15 @@
 import { Button } from '@/components/ui/button'
-import { PlusIcon } from '@radix-ui/react-icons'
 import Link from 'next/link'
+import { PropsWithChildren } from 'react'
 
-interface AddLensButtonProps {}
+export interface AddLensButton {
+  teamSlug: string
+}
 
-export function AddLensButton({}: AddLensButtonProps) {
+export function AddLensButton({ teamSlug }: PropsWithChildren<AddLensButton>) {
   return (
-    <Link href="/dashboard/lenses/new" passHref>
-      <Button variant={'outline'}>
-        <PlusIcon />
-      </Button>
+    <Link href={`/teams/${teamSlug}/lenses/new`} passHref>
+      <Button variant={'outline'}>Add Lens</Button>
     </Link>
   )
 }

packages/app/src/components/lenses/new-form.action.tsx

@@ -4,14 +4,20 @@ import 'server-only'
 import { createAction, protectedProcedure } from '@/server/trpc'
 import { rhfActionSchema } from './new-form.schema'
 import { createLens } from '@/db/services/lenses'
+import { isAllowed } from '@/server/trpc'
 
 export const rhfAction = createAction(
-  protectedProcedure.input(rhfActionSchema).mutation(
-    async opts =>
-      await createLens({
-        name: opts.input.name,
-        description: opts.input.description,
-        spec: opts.input.spec
-      })
-  )
+  protectedProcedure
+    .use(isAllowed('write'))
+    .input(rhfActionSchema)
+    .mutation(
+      async opts =>
+        await createLens({
+          name: opts.input.name,
+          description: opts.input.description,
+          spec: opts.input.spec,
+          ownerId: opts.ctx.meta.ownerId,
+          resourceType: 'lens'
+        })
+    )
 )

packages/app/src/components/lenses/new-form.schema.tsx

@@ -9,7 +9,7 @@ const readJSONFile = async (file: File) =>
   })
 
 export const rhfActionSchema = z.object({
-  name: z.string().min(3).max(256).default(''),
+  name: z.string().trim().min(3).max(256).default(''),
   spec: z
     .union([
       z

packages/app/src/components/lenses/new-form.tsx

@@ -22,9 +22,14 @@ import { z } from 'zod'
 import { useAction } from '@/trpc/client'
 import { useRouter } from 'next/navigation'
 
-export type NewLensFormProps = {}
+export type NewLensFormProps = {
+  teamSlug: string
+}
 
-export function NewLensForm({ ...props }: PropsWithChildren<NewLensFormProps>) {
+export function NewLensForm({
+  teamSlug,
+  ...props
+}: PropsWithChildren<NewLensFormProps>) {
   const form = useForm<z.infer<typeof rhfActionSchema>>({
     resolver: zodResolver(rhfActionSchema),
     defaultValues: {
@@ -47,7 +52,7 @@ export function NewLensForm({ ...props }: PropsWithChildren<NewLensFormProps>) {
 
   useEffect(() => {
     if (mutation.status === 'success') {
-      router.push(`/dashboard/lenses/${mutation.data?.id}`)
+      router.push(`/teams/${teamSlug}/profiles/${mutation.data?.id}`)
     }
   }, [mutation.status, mutation.data?.id, router])
 

packages/app/src/db/models/lens-pillar-risks.ts

@@ -15,6 +15,7 @@ import {
   ForeignKey
 } from 'sequelize-typescript'
 import { LensPillarQuestion } from './lens-pillar-questions'
+import { Risk } from '../schemas/spec'
 
 export enum QuestionRisk {
   Unanswered = 'UNANSWERED',
@@ -58,8 +59,8 @@ export class LensPillarQuestionRisk extends Model<
 
   @NotEmpty
   @Default(QuestionRisk.Unanswered)
-  @Column(DataType.ENUM(...Object.values(QuestionRisk)))
-  risk!: QuestionRisk
+  @Column(DataType.ENUM(...Object.values(Risk)))
+  risk!: Risk
 
   @NotEmpty
   @Min(3)

packages/app/src/db/models/lens.ts

@@ -30,11 +30,11 @@ export interface LensAttributes {
   isDraft: boolean
   description?: string
   pillars?: LensPillar[]
-  tags: Tag[]
-  teams: Team[]
-  createdAt: Date
-  updatedAt: Date
-  deletedAt: Date
+  tags?: Tag[]
+  teams?: Team[]
+  createdAt?: Date
+  updatedAt?: Date
+  deletedAt?: Date
 }
 
 export type LensCreationAttributes = Omit<
@@ -51,34 +51,34 @@ export class Lens extends Model<LensAttributes, LensCreationAttributes> {
   @AllowNull(false)
   @Default(DataType.UUIDV4)
   @Column(DataType.UUIDV4)
-  id!: string
+  declare id: string
 
   @NotEmpty
   @Min(3)
   @Max(256)
-  @Column
-  name!: string
+  @Column(DataType.STRING)
+  declare name: string
 
   @NotEmpty
-  @Column
-  version!: string
+  @Column(DataType.STRING)
+  declare version: string
 
   @NotEmpty
   @Column(DataType.JSONB)
-  spec!: Spec
+  declare spec: Spec
 
   @Default(true)
-  @Column
-  isDraft?: boolean
+  @Column(DataType.BOOLEAN)
+  declare isDraft: boolean
 
   @NotEmpty
   @Min(12)
   @Max(2048)
-  @Column
-  description?: string
+  @Column(DataType.STRING)
+  declare description?: string
 
   @HasMany(() => LensPillar, 'lensId')
-  pillars?: LensPillar[]
+  declare pillars?: LensPillar[]
 
   @BelongsToMany(() => Tag, {
     through: {
@@ -109,14 +109,14 @@ export class Lens extends Model<LensAttributes, LensCreationAttributes> {
   declare teams: Team[]
 
   @CreatedAt
-  @Column
-  createdAt?: Date
+  @Column(DataType.DATE)
+  declare createdAt: Date
 
   @UpdatedAt
-  @Column
-  updatedAt?: Date
+  @Column(DataType.DATE)
+  declare updatedAt: Date
 
   @DeletedAt
-  @Column
-  deletedAt?: Date
+  @Column(DataType.DATE)
+  declare deletedAt: Date
 }

packages/app/src/db/schemas/lenses.ts

@@ -1,16 +1,21 @@
 import { z } from 'zod'
 import { FindOneTeamByNameSlug } from './teams'
 import { PaginationSchema } from './pagination'
+import { ScopeSchema } from './scope'
 
 export const LensesGetSchema = z.string().uuid()
 export const LensesDeleteSchema = z.string().uuid()
 export const LensesPublishSchema = z.string().uuid()
 export const LensesGetQuestionSchema = z.string()
-export const LensesAddSchema = z.object({
-  name: z.string().min(1).max(256),
-  description: z.string().min(10).max(2048),
-  spec: z.string()
-})
+
+export const LensesAddSchema = z
+  .object({
+    name: z.string().min(1).max(256),
+    description: z.string().min(10).max(2048),
+    spec: z.string()
+  })
+  .and(ScopeSchema)
+export type CreateLens = z.infer<typeof LensesAddSchema>
 
 export const ListLensByTeamSlug = FindOneTeamByNameSlug.and(PaginationSchema)
 export type ListLensByTeamSlug = z.infer<typeof ListLensByTeamSlug>

packages/app/src/db/schemas/spec.ts

@@ -17,7 +17,6 @@ export const Risk = z.object({
   ]),
   condition: z.string()
 })
-
 export type Risk = z.infer<typeof Risk>
 
 export const Improvement = z.object({

packages/app/src/db/services/lenses.ts

@@ -8,15 +8,18 @@ import {
   LensesGetSchema,
   LensesDeleteSchema,
   LensesPublishSchema,
-  LensesGetQuestionSchema,
-  LensesAddSchema
+  LensesGetQuestionSchema
 } from '../schemas/lenses'
 import { Team } from '../models/teams'
 import sequelize from '@/db/config/config'
 import { z } from 'zod'
 import { LensPillarResource } from '../models/lens-pillar-resources'
-import { LensPillarQuestionRisk } from '../models/lens-pillar-risks'
-import { ListLensByTeamSlug } from '../schemas/lenses'
+import {
+  LensPillarQuestionRisk,
+  QuestionRisk
+} from '../models/lens-pillar-risks'
+import { ListLensByTeamSlug, CreateLens } from '../schemas/lenses'
+import { Ownership } from '../models/ownership'
 
 export type Pagination = {
   offset?: number
@@ -47,7 +50,7 @@ export const deleteLens = async (opts: z.infer<typeof LensesDeleteSchema>) =>
 export const publishLens = async (opts: z.infer<typeof LensesPublishSchema>) =>
   await Lens.update({ isDraft: false }, { where: { id: opts } })
 
-export const createLens = async (opts: z.infer<typeof LensesAddSchema>) =>
+export const createLens = async (opts: CreateLens) =>
   await sequelize.transaction(async transaction => {
     const spec = await Spec.parseAsync(JSON.parse(opts.spec))
 
@@ -63,6 +66,15 @@ export const createLens = async (opts: z.infer<typeof LensesAddSchema>) =>
       }
     )
 
+    const ownership = await Ownership.create(
+      {
+        ...opts,
+        resourceId: lens.id,
+        resourceType: 'lens'
+      },
+      { transaction }
+    )
+
     const pillars = await LensPillar.bulkCreate(
       [
         ...spec.pillars.map(pillar => ({
@@ -112,7 +124,7 @@ export const createLens = async (opts: z.infer<typeof LensesAddSchema>) =>
           ...(spec.pillars[a].questions[b]?.risks?.map(risk => {
             return {
               questionId: question.id,
-              risk: risk.risk,
+              risk: QuestionRisk[risk.risk as keyof typeof QuestionRisk],
               condition: risk.condition
             }
           }) ?? [])