Move langtag rendering from dn/Entry into Attribute - more enhancements for #16,

Reduce use of style= tags,
Cosmetic layout changes,
Layout change to enable rendering template views,
<attribute> id tags are now lowecase

app/Classes/LDAP/Attribute.php

@@ -148,6 +148,13 @@ class Attribute implements \Countable, \ArrayAccess
 			'description' => $this->schema ? $this->schema->{$key} : NULL,
 			// Attribute hints
 			'hints' => $this->hints(),
+			// Attribute language tags
+			'langtags' => ($this->no_attr_tags || (! $this->_values->count()))
+				? collect(Entry::TAG_NOTAG)
+				: $this->_values
+					->keys()
+					->filter(fn($item)=>($item === Entry::TAG_NOTAG) || preg_match(sprintf('/%s;?/',Entry::TAG_CHARS_LANG),$item))
+					->sortBy(fn($item)=>($item === Entry::TAG_NOTAG) ? NULL : $item),
 			// Can this attribute be edited
 			'is_editable' => $this->schema ? $this->schema->{$key} : NULL,
 			// Is this an internal attribute
@@ -198,17 +205,23 @@ class Attribute implements \Countable, \ArrayAccess
 
 	public function count(): int
 	{
-		return $this->_values->dot()->count();
+		return $this->_values
+			->dot()
+			->count();
 	}
 
 	public function offsetExists(mixed $offset): bool
 	{
-		return $this->_values->dot()->has($offset);
+		return $this->_values
+			->dot()
+			->has($offset);
 	}
 
 	public function offsetGet(mixed $offset): mixed
 	{
-		return $this->_values->dot()->get($offset);
+		return $this->_values
+			->dot()
+			->get($offset);
 	}
 
 	public function offsetSet(mixed $offset, mixed $value): void
@@ -315,11 +328,10 @@ class Attribute implements \Countable, \ArrayAccess
 	 * @param bool $edit Render an edit form
 	 * @param bool $old Use old value
 	 * @param bool $new Enable adding values
-	 * @param string $langtag Langtag to use when rendering these attribute values
 	 * @param bool $updated Has the entry been updated (uses rendering highlights))
 	 * @return View
 	 */
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		if ($this->is_internal)
 			// @note Internal attributes cannot be edited
@@ -340,7 +352,6 @@ class Attribute implements \Countable, \ArrayAccess
 			->with('edit',$edit)
 			->with('old',$old)
 			->with('new',$new)
-			->with('langtag',$langtag)
 			->with('updated',$updated);
 	}
 
@@ -376,7 +387,7 @@ class Attribute implements \Countable, \ArrayAccess
 	 *
 	 * @return Collection
 	 */
-	public function required(): Collection
+	private function required(): Collection
 	{
 		// If we dont have any objectclasses then we cant know if it is required
 		return $this->oc->count()

app/Classes/LDAP/Attribute/Binary/JpegPhoto.php

@@ -15,14 +15,13 @@ final class JpegPhoto extends Binary
 {
 	use MD5Updates;
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.binary.jpegphoto')
 			->with('o',$this)
 			->with('edit',$edit)
 			->with('old',$old)
 			->with('new',$new)
-			->with('langtag',$langtag)
 			->with('updated',$updated)
 			->with('f',new \finfo);
 	}

app/Classes/LDAP/Attribute/Internal/Timestamp.php

@@ -12,7 +12,7 @@ use App\Ldap\Entry;
  */
 final class Timestamp extends Internal
 {
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Internal attributes cannot be edited
 		return view('components.attribute.internal.timestamp')

app/Classes/LDAP/Attribute/KrbPrincipalKey.php

@@ -17,7 +17,7 @@ final class KrbPrincipalKey extends Attribute
 
 	protected(set) bool $no_attr_tags = TRUE;
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.krbprincipalkey')
 			->with('o',$this)

app/Classes/LDAP/Attribute/KrbTicketFlags.php

@@ -50,7 +50,7 @@ final class KrbTicketFlags extends Attribute
 		return $helpers;
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.krbticketflags')
 			->with('o',$this)

app/Classes/LDAP/Attribute/ObjectClass.php

@@ -70,7 +70,7 @@ final class ObjectClass extends Attribute
 			->contains($value);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.objectclass')
 			->with('o',$this)

app/Classes/LDAP/Attribute/Password.php

@@ -80,7 +80,7 @@ final class Password extends Attribute
 		return ($helpers=static::helpers())->has($id) ? new ($helpers->get($id)) : NULL;
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.password')
 			->with('o',$this)

app/Classes/LDAP/Attribute/RDN.php

@@ -14,6 +14,9 @@ use App\Ldap\Entry;
 final class RDN extends Attribute
 {
 	private string $base;
+
+	protected(set) bool $no_attr_tags = TRUE;
+
 	private Collection $attrs;
 
 	public function __get(string $key): mixed
@@ -32,7 +35,7 @@ final class RDN extends Attribute
 		]);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.rdn')
 			->with('o',$this);

app/Classes/LDAP/Attribute/Schema.php

@@ -54,7 +54,7 @@ abstract class Schema extends Attribute
 			__('No description available, can you help with one?'));
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.internal')

app/Classes/LDAP/Attribute/Schema/Generic.php

@@ -12,7 +12,7 @@ use App\Ldap\Entry;
  */
 class Generic extends Schema
 {
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.generic')

app/Classes/LDAP/Attribute/Schema/Mechanisms.php

@@ -34,7 +34,7 @@ final class Mechanisms extends Schema
 		return parent::_get(config_path('ldap_supported_saslmechanisms.txt'),$string,$key);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.mechanisms')

app/Classes/LDAP/Attribute/Schema/OID.php

@@ -35,7 +35,7 @@ final class OID extends Schema
 		return parent::_get(config_path('ldap_supported_oids.txt'),$string,$key);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.oid')

app/Http/Controllers/HomeController.php

@@ -356,7 +356,9 @@ class HomeController extends Controller
 		return Redirect::to('/')
 			->withInput()
 			->with('updated',collect($dirty)
-				->map(fn($item,$key)=>$o->getObject(collect(explode(';',$key))->first())));
+				->map(fn($item,$key)=>$o->getObject(collect(explode(';',$key))->first()))
+				->values()
+				->unique());
 	}
 
 	/**

app/Ldap/Entry.php

@@ -21,11 +21,16 @@ use App\Exceptions\InvalidUsage;
 class Entry extends Model
 {
 	private const TAG_CHARS = 'a-zA-Z0-9-';
-	private const TAG_CHARS_LANG = 'lang-['.self::TAG_CHARS.']';
+	public const LANG_TAG_PREFIX = 'lang-';
+	public const TAG_CHARS_LANG = self::LANG_TAG_PREFIX.'['.self::TAG_CHARS.']+';
 	public const TAG_NOTAG = '_null_';
 
 	// Our Attribute objects
 	private Collection $objects;
+
+	// Templates that apply to this entry
+	private(set) Collection $templates;
+
 	// For new entries, this is the container that this entry will be stored in
 	private string $rdnbase;
 
@@ -34,6 +39,7 @@ class Entry extends Model
 	public function __construct(array $attributes = [])
 	{
 		$this->objects = collect();
+		$this->templates = collect(['default'=>__('LDAP Entry')]);
 
 		parent::__construct($attributes);
 	}
@@ -308,14 +314,7 @@ class Entry extends Model
 	public function getLangTags(): Collection
 	{
 		return $this->getObjects()
-			->filter(fn($item)=>! $item->no_attr_tags)
-			->map(fn($item)=>$item
-				->values
-				->keys()
-				->filter(fn($item)=>preg_match(sprintf('/%s+;?/',self::TAG_CHARS_LANG),$item))
-				->map(fn($item)=>preg_replace('/lang-/','',$item))
-			)
-			->filter(fn($item)=>$item->count());
+			->map(fn($item)=>$item->langtags);
 	}
 
 	/**
@@ -373,7 +372,7 @@ class Entry extends Model
 					$item && collect(explode(';',$item))->filter(
 						fn($item)=>
 							(! preg_match(sprintf('/^%s$/',self::TAG_NOTAG),$item))
-							&& (! preg_match(sprintf('/^%s+$/',self::TAG_CHARS_LANG),$item))
+							&& (! preg_match(sprintf('/^%s$/',self::TAG_CHARS_LANG),$item))
 						)
 						->count())
 			)

app/View/Components/Attribute.php

@@ -6,7 +6,6 @@ use Illuminate\Contracts\View\View;
 use Illuminate\View\Component;
 
 use App\Classes\LDAP\Attribute as LDAPAttribute;
-use App\Ldap\Entry;
 
 class Attribute extends Component
 {
@@ -14,18 +13,16 @@ class Attribute extends Component
 	public bool $edit;
 	public bool $new;
 	public bool $old;
-	public string $langtag;
 
 	/**
 	 * Create a new component instance.
 	 */
-	public function __construct(?LDAPAttribute $o,bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE)
+	public function __construct(?LDAPAttribute $o,bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE)
 	{
 		$this->o = $o;
 		$this->edit = $edit;
 		$this->old = $old;
 		$this->new = $new;
-		$this->langtag = $langtag;
 		$this->updated = $updated;
 	}
 
@@ -38,7 +35,7 @@ class Attribute extends Component
 	{
 		return $this->o
 			? $this->o
-				->render(edit: $this->edit,old: $this->old,new: $this->new,langtag: $this->langtag,updated: $this->updated)
+				->render(edit: $this->edit,old: $this->old,new: $this->new,updated: $this->updated)
 			: __('Unknown');
 	}
 }